handle empty input properly
Merge pull request #314 from teharrison/develop

handle empty input properly