Merge and squash branch 'renaming'
Merge branch '1.0.4'