Bugfix Nr. 51
Merge branch 'master' of https://github.com/fischerdom/tasking