Add description of usage
Merge branch 'master' into develop