bugfix #1
Merge branch 'bugfix_1' into dev