Merge pull request #4 from daypro/develop

commit from Eclipse