Merge pull request #40 from pcambra/dollar_sign