Merge pull request #3 from daypro/master

Merge pull request #2 from daypro/develop
test
commit from Eclipse
Merge pull request #4 from daypro/develop

commit from Eclipse