Merge pull request #266 from jkuk/master

fixed task removal
Merge pull request #267 from jkuk/master

FOR KETTY!!!!!!
couple minor bug fixes
Merge remote-tracking branch 'upstream/master'