Merged in changes from development repository.  Working on `show metadata' command.