DS-103 improve parsing
Merge pull request #48 from fozeek/DS-103-improveParsing

DS-103 improve parsing