missing versionadded, after that it's ready to merge