features for #127
some bugfixes
Merge remote-tracking branch 'origin/develop-ak' into develop-ak