Improved checking on task logic
Merge branch 'master' of github.com:joeandaverde/half-empty