Feature/c++11 support