Improved design, addtasks module. closes #38, closes #29
Merge remote-tracking branch 'origin/master'