Feature update
Bugfix: Added message
Merge branch 'bugfix' into develop