Account for Hyhy's professionalism in some edge cases
Merge pull request #9 from jshufro/master

Account for Hyhy's professionalism in some edge cases