issue #583 removing C++11 code.
Merge pull request #751 from psl-felipefarinon/master

Removing C++11 code.