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

Update to include Steve's solution