TODO removed
Merge pull request #11 from tomtomssi/parsing

TODO removed