update
Merge branch 'master' of https://github.com/cgnieder/tasks

merge changes
update
Merge branch 'master' of https://github.com/cgnieder/tasks
fix issue #4