updated
Merge pull request #2 from prohumine/iteration4

updated