Added my solution; fixed problematic merge
Merge pull request #374 from peterhurford/patch-4

Added my solution; fixed problematic merge