Merge pull request #10 from Bfinity/parsing

Parsing
Looks good!
Merge remote-tracking branch 'upstream/master'