Updated substitution code
Merge branch 'master' of github.com:guyc/SSAML