resolved enum errors
Merge branch 'master' of github.com:mcandre/mcandre
resolving Xcode clang++ C++11 issues