Added better parsing strategy
Merge pull request #73 from berkona/dev

Added better parsing strategy