Removed dependence on c++11