cxx11
Merge branch 'dev'