Merge pull request #1 from sumonz/develop

Develop
Merge branch 'master' into webservice
merge