Updated to C++11 Standard