Pull request to master

Tip: Use `#pragma mark Game Events` instead. It helps organize code in the Jump Bar for easy access. See http://goo.gl/xDCp4g. :)