Made tweaks with Michael.
Merge branch 'development' of https://github.com/DadiuTeamOne/Blue into development