Corrects package purpose
Merge branch 'master' into develop
Minor changes