Fix bug, update
Merge branch 'master' of https://github.com/gaumup/zenwork