Add C++11 support