New capture approach in grammar parser
Merge branch 'develop' of github.com:prymatex/prymatex into develop