fix bugs
Merge branch 'master' of github.com:raven-debridement/master-control