Merge pull request #6 from daypro/develop

Merge pull request #5 from daypro/master