fix salary string format
Merge branch 'master' into windows-build