trim correctly and add unit test
Merge branch 'master' into meta
fix stupid find replace error
Add CMakeLists.txt
Merge branch 'cmake'
Merge pull request #1 from meta-toolkit/master

Add CMakeLists.txt and sync with meta branch