Merge pull request #1 from pxify/dev

Dev