Quick VIsual Fixes
Merge origin/master