Migrating to C++11 - run clang-modernize.
Merge pull request #173 from yachoor/modernize

Migrating to C++11 - run clang-modernize.