Make usage instructions clearer
Merge branch 'master' into debian