Merge branch 'Dev'
Merge pull request #1 from icharge/master

Merge branch 'Dev'