added substitution
now it's robust
Merge pull request #10 from waynechang/master

Substitution