Version 0.2 update
CMake scripts
Merge