Fixed tasks bugs
Merge branch 'master' of https://github.com/wunki/rockstart-pimpin