add tests and update docu
Merge remote-tracking branch '52n/develop'