Syntax refinements
Merge branch 'master' of github.com:jeffreybaird/merit into test