File listing improvements

This pull request fixes #115.