Full refactor Parser
Merge pull request #8 from golyshevd/refactor

Full refactor Parser