TA's solution
Merge pull request #65 from whimsycwd/master

TA's solution