Merge branch 'master' of github.com:natekandler/parser into driver-prese...

...nter