New version with CXX11
