Tested out new C++ 11 features
Merge pull request #2 from mholyoak/cleanup

Tested out new C++ 11 features