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

Solution for problem #2