Merge pull request #224 from metti/parser

Expression Parser: Retain single '$' signs before terminators