Fixed small type in gsub (proper escaping needed)
Merge branch 'hotfix/v1.0.1' into develop
Merge branch 'hotfix/v1.0.1'
Merge branch 'develop'

* develop: