bugfix
Merge remote-tracking branch 'origin/dev' into thomas
bugfixes
merged thomas into tcuje