Bugfix to parsing.
Merge branch 'master' of github.com:matoakley/weight
Remove debug lines.