+ remove redundant const qualifier
+ c++ style
Merge remote-tracking branch 'origin/master'