Add missing C++11 keywords
Merge pull request #158 from crumblingstatue/master

Add missing C++11 keywords