fix bugs
Merge branch 'master' of github.com:jjchen/woodchuck