Improved grammar for expression compilation
Merge branch 'master' of https://github.com/SlackUnfairguy/tool