Makes the list command more agnostic
Merge pull request #4 from mezis/list-command-fixes

Makes the list command more agnostic