No more neck pain
Merge branch 'master' of https://github.com/BeaconTeam/Beacon