Changed to allow 5-7 characters. Added hacky fix for image caching.
Merge branch 'tweak' into develop