Update master branch with better CMake
Merge branch 'master' of https://github.com/vladpetric/ntest into jmobs2
Use tmpnam (even though it's bad)
Merge branch 'jmobs2' of https://github.com/vladpetric/ntest into jmobs2