minor bugfixes
Merge branch 'development'