Merge pull request #76 from kirill-kornyakov/preps-for-lab04

Preps for lab04
Added CMake and refactored sample
Added CMake