Client requested banner scaling
CR fixes
Mark changed the error messages
Add nullnesscheck
Remove testing flag
Merge branch 'master' into github