Merge pull request #93 from peastman/master

Get the version number from the CMake script
Merge pull request #94 from peastman/master

Fixed some compilation errors