Merge pull request #2 from daypro/develop

Develop
Merge pull request #3 from daypro/master

Merge pull request #2 from daypro/develop