Added CMakeLists file.
Merged changes.