Includes test and documentation for new feature Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>