wip: extend
wip: extend
moved comment
extend: added a test
Merge branch 'dev-extend' into dev