merged yosefm/cmake_submission to my master