fix bugs
adjust
Merge branch 'master' of https://github.com/smeite/smeite