Merge branch 'develop'
Update README.md
Update README.md
Tweaked CMakeLists for Windows support
Update README.md
Merge branch 'master' into develop