Fix some of the parsing issues.
Merge branch 'master' of github.com:dxw/rsparly2013