9-19 updates
Merge branch 'master' of https://github.com/alexmasluk/CPPDev