bugfix #9
Merge branch 'bugfix_9' into dev