Merge pull request #2 from stepinmobile-max/dev

Dev