trim correctly and add unit test
Merge branch 'master' into meta
fix stupid find replace error
Add CMakeLists.txt
Merge branch 'cmake'