Improve parser
Merge pull request #6 from golyshevd/parser

Improve parser