Bugfix pt 3
Merge branch 'master' of github.com:caniscide/sweat-shop into spirit