fixes
Merge branch 'master' of github.com:/santazhang/toolkit