added some C++11 sugar