Commiting latest changes

1. added --list
2. added --file option (not implemented)