fix minor bugs
Merge branch 'master' of https://github.com/timepp/winsettings