Merge pull request #7 from josefmonje/master

new pull request
Merge pull request #4 from nadinejamila/master

Merge pull request #7 from josefmonje/master