fixed parsing issues
Merge pull request #128 from me-stefan-baiu/master

fixed parsing issues