Issue #69
Issue #67
Merge branch 'master' of github.com:NICTA/course
solution for mapParser