Merge pull request #1 from pxify/dev

Dev
Merge pull request #2 from pxify/master

Merge pull request #1 from pxify/dev