obedovat parser improved

fixes #25
Merge pull request #36 from drvic10k/master

obedovat parser improved