Merge pull request #1 from zao/master

Simple CMake build scripts and Linux fixes