Added some c++11 and stl messing-arounds