Improve $ replace logic
Rebuild packages
Merge branch 'master' into gh-pages