Merge pull request #13 from eile/master

CMake external update
Fix build