really small changes in prep for new branch
Merge branch 'develop' of github.com:charlieroberts/Gibber into develop