Merge branch 'release-1.0'
checking the hotfix commands
Merge branch 'hotfix-1.0.1' into develop