Tron update
Merge branch 'master' of https://github.com/mholgatem/piplay-modified