Merge branch 'release/1.0.1'
Merge branch 'develop'
Check for package definition before declaring. Tidy up naming.