Merge pull request #1 from chriswalpen/master

Map to custom containers and added substitute extensions
Created Substitution
Merge remote-tracking branch 'upstream/master'