Change usage to use commands instead of functions
Merge branch 'docs'