All the parsing changes we dicsussed
Merge pull request #1 from ozimchuk/main_changes

All the parsing changes we dicsussed