Merge pull request #1 from daypro/master

commit original code
Merge pull request #2 from daypro/develop

Merge pull request #1 from daypro/master