Correct values returned when no matches exist
Add tests for new cases
Merge pull request #7 from wilsonge/patch-1

Correct values returned when no matches exist