Updated usage
Merge branch 'develop'