bug fixes

- Jonas
Merge origin/master