FIX: fixed misleading docstring (see bertrand's comments on PR #280)
FIX: local merge conflict