Merge pull request #51 from cpubug/master

CMAKE support