parsing rules
changed parsing strategy
more parsing rules
auto-merge staging into master