fixed something
Merge branch 'vogel' into dev