Initial parsing
Merge branch 'master' of github.com:barrybridgens/bjbtask