more setup
Merge branch 'master' of https://github.com/Widar91/substitutions