stivyw Contrib
Merge pull request #1 from stivyw/master

stivyw Contrib Pull