Potential Scala solution
Merge pull request #35 from stevenheidel/master

Looks fine to me now (added as complete solution), any reason its marked "potential"?