team 4s other solution
Merge pull request #5 from bootandy/master

Team 4's other solution.