added some more parsing stuff
Merge remote-tracking branch 'Ryan/master'