Fixed documentation (test)
Merge remote-tracking branch 'origin/bugfixes' into rob