bugfix
Merge branch 'developer'