Merge branch 'develop' of github.com:cassy1003/4E into develop
Merge pull request #22 from cassy1003/develop

Develop
Merge branch 'develop' of github.com:cassy1003/4E into develop
Merge branch 'master' of github.com:cassy1003/4E into develop