Bugfix: Added message
Merge branch 'bugfix' into develop
Bugfix: Typo
Merge branch 'bugfix' into develop
Merge branch 'feature'
Merge branch 'feature' into develop
Merge branch 'feature'
Merge branch 'feature' into develop
Merge branch 'develop'