Merge branch 'develop'

* develop:
  Initial commit of the codes
GUID CHANGED!
Merge branch 'hotfix/1.0.1' into develop