Update to latest release
Merge pull request #39 from frap129/5.0.0_r7

Update to latest release
Merge pull request #1 from TeamHorizon/lollipop

Merge Upstream