rename
Merge branch 'master' into Tidy-Up
exception message
Merge pull request #1 from BrainBubble/Tidy-Up

Tidy up