Merge pull request #4 from MattSkala/master

Parsing tweaks
New test source
Fixed error when weight not available
Merge remote-tracking branch 'upstream/master'