changed for loop to c++11
Merge branch 'origin/master'