add const flag to function parameters
Merge branch 'master', remote-tracking branch 'origin/master' into multithread
Merge branch 'multithread', remote-tracking branch 'origin/multithread' into multithread