Now compiles c++11