Modified to support more-tasks
Merge pull request #4 from hayajo/feature/more_tasks

Modified to support more-tasks