Simplified taskNumber.
Fixed minor errors in parser, added more test cases.
Merge remote-tracking branch 'origin/master' into nathan
Merge remote-tracking branch 'origin/nathan'
Merge remote-tracking branch 'origin/nathan'