Substitutions in commands

Closes #2