Update to include Steve's solution
Merge pull request #682 from beesmart/patch-2

Update to include Steve's solution