Use `slice` not `substring`
Merge branch 'master' into geezer