Changes made for challenge
Merge pull request #4 from tinekef/master

Changes made for challenge