Add provisions for a manual warning message
Slightly tweak visual
Bump version
Merge branch 'develop'