Merge branch 'code-and-cmake-cleanup' into 'master'

Code and cmake cleanup

See merge request !94

Tested manually in different containers to verify version compatibility.