some variables are changed to const
Merge remote-tracking branch 'origin/master'