Merge pull request #51 from lategoodbye/master

Improve data parsing