pushed new version from development branch and switched to CMake