Merge pull request #2 from manage/master

Merge pull request #1 from manage/develop
Merge pull request #3 from manage/develop

Merge pull request #2 from manage/master