Adding subst2
Merge pull request #2 from jkoppel/master

Adding subst2.