Bug Fixes to Patch 1

Some quick fixes to a compilation error and a build of the new version!
Merge pull request #2 from Chemuhk/Patch-v1

Bug Fixes to Patch 1