Full fix for #195 (border flash bug)
Merge pull request #247 from adrian17/border_flash_fix

Full fix for #195 (border flash bug)