fix #3 and #4, CMakeLists.txt examples quirks

Fix files used in wiki tutorials, fix #3 and #4