Improve parser
Merge pull request #7 from golyshevd/parser

Improve parser