Improved parser
Merge branch 'parser'