Merge pull request #4 from manage/master

Merge
Merge pull request #5 from manage/develop

Merge pull request #4 from manage/master