Merge tag '1.pre.0.4' into develop

Fix

* tag '1.pre.0.4':
fix sub to gsub
Merge branch 'release/1.pre.0.5'

* release/1.pre.0.5:
  fix sub to gsub