improved c++11 speed
Merge branches 'benchmark' and 'master'