Added C++11 goodness.