Merge pull request #18 from ahmedcharles/development

Fix cmake build with travis.