More fixing of $ issue
Merge pull request #291 from bauerca/master

More fixing of $ issue