...
Merge branch 'master' of https://github.com/TehApple/sheepdog
Merge branch 'master' of https://github.com/TehApple/sheepdog
fixed bugs