Rewrote substitution
Merge pull request #10 from 013/master

Rewrote substition