Added C++11 support