Merge c++11 with latest changes and push it to master