Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Fixes #1
Merge branch 'hotfix/issue-1' into develop