More tweaks
Merge branch 'develop'