Fix a bug when replacing $ to _
Merge branch 'master' into gh-pages