Merge branch 'hotfixIssue#3' into develop
Merge branch 'develop'