Improved code with C++11
Merge branch 'master' of github.com:dgodfrey95/GIT