Hunting edge cases.
Merge pull request #39 from johnb30/hunting

Hunting edge cases.