Removed C++ 11 features ( not supported with gcc)