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

Merge Upstream
Update to latest release
Merge pull request #40 from frap129/lollipop

Update to Latest Release