Added C++11 features to code.