Merge pull request #1 from steven-cutting/master

Master
Merge pull request #2 from steven-cutting/stable

Merge pull request #1 from steven-cutting/master