Added MSVC optimisation support to cmake file
Merge branch 'master' into iridis