Merge pull request #2 from stepinmobile-max/dev

Dev
Merge pull request #3 from stepinmobile-max/master

Merge pull request #2 from stepinmobile-max/dev