Merge pull request #1 from zombiesh/master

merge master and develop
Merge branch 'develop'