Moved to C++11 standard