Updated to C++ 11 standard