Removing style from parser, updating data
Merge pull request #1 from davy/master

Removing style from parser, updating data