Changed code for list command.
Merging branch with master.