Minor amendments
Merge branch 'develop'