Merge pull request #4 from daypro/develop

commit from Eclipse
Merge pull request #5 from daypro/master

Merge pull request #4 from daypro/develop