removed c++11 dependency
Merge branch 'q2'