Fixing file selection problem by tokenizing name.

Resolves #134.