Branching to change the hard-coded name and to possibly do some improvements on the make/build process