Mention --use in usage information
Merge branch 'patch-1'