redone: added substitution
tests: added tests for sub
merge branch 'regex-sub'