Merge pull request #42 from lauriii/revert-40-dollar_sign