Bugfix and doc