Parse Merge

I'm not sure why I can't push directly, so I forked and pushed to that, so here's a pull request. :)


-matt