v1.0 - Grapple and boost updates
Merge remote-tracking branch 'origin/alpha' into Zerahan