Merge pull request #1 from orvice/dev

Dev
Merge pull request #2 from orvice/master

Merge pull request #1 from orvice/dev