bugfix 15,21,30
Merge branch 'master' of https://github.com/fischerdom/tasking