Get parser and test running
Merge branch 'master' of github.com-vixon:vixon/gurk