Added C++11 syntax support