- fixed $ conflict. Closes #525
Merge branch 'master' into gh-pages