Ambiguous filenames and correct exit
Merge pull request #3 from dobradley/client

Ambiguous filenames and correct exit