Some changes hoping to improve performance...
Merge branch 'master' of github.com:Slin/LD31