Solution for problem #4
Merge pull request #2 from MisterGlass/master

Solution for problem #4