Fixed parser rules
auto-merge staging into master