refactor fragile parsing method
Merge pull request #26 from ridoo/master

refactor fragile parsing method