Merge pull request #1 from Casyfill/master

subs
Merge pull request #15 from Casyfill/pr/13

Merge pull request #1 from Casyfill/master