diff --git a/README.md b/README.md
index 6284fe7a..29201852 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Version 1.2 - "Shienar" - -in development-
 
 Significant API changes:
 
-* Upgraded to Pixi.js 1.4.4
+* Upgraded to Pixi.js 1.5
 * Group now extends PIXI.DisplayObjectContainer, rather than owning a _container property, which makes life a whole lot easier re: nesting.
 * Removed Sprite.group property. You can use Sprite.parent for all similar needs now.
 * PIXI.Point is now aliased to Phaser.Point - saves on code duplication and works exactly the same.
@@ -111,6 +111,8 @@ Bug Fixes:
 * Previously if you used Sprite.crop() it would crop all Sprites using the same base image. It now takes a local copy of the texture data and crops just that.
 * Tilemap had the wrong @method signatures so most were missing from the docs.
 * Fixed bug where changing State would cause the camera to not reset if it was following an object.
+* Tile had 2 properties (callback and callbackContext) that were never assigned, updated to use the proper names (thanks ratkingsimon)
+
 
 
 You can view the Change Log for all previous versions at https://github.com/photonstorm/phaser/changelog.md
diff --git a/src/gameobjects/BitmapData.js b/src/gameobjects/BitmapData.js
index 3c783ab1..38104592 100644
--- a/src/gameobjects/BitmapData.js
+++ b/src/gameobjects/BitmapData.js
@@ -1034,7 +1034,7 @@ Phaser.BitmapData.prototype.lf = Phaser.BitmapData.prototype.beginLinearGradient
 * Shortcut to beginRadialGradientFill.
 * @method Phaser.BitmapData.prototype.rf
 */
-Phaser.BitmapData.prototype.rf = Phaser.BitmapData.prototype.beginRadialGradientFill;
+// Phaser.BitmapData.prototype.rf = Phaser.BitmapData.prototype.beginRadialGradientFill;
     
 /**
 * Shortcut to beginBitmapFill.
@@ -1046,7 +1046,7 @@ Phaser.BitmapData.prototype.rf = Phaser.BitmapData.prototype.beginRadialGradient
 * Shortcut to endFill.
 * @method Phaser.BitmapData.prototype.ef
 */
-Phaser.BitmapData.prototype.ef = Phaser.BitmapData.prototype.endFill;
+// Phaser.BitmapData.prototype.ef = Phaser.BitmapData.prototype.endFill;
 
 /**
 * Shortcut to setStrokeStyle.
diff --git a/src/tilemap/Tile.js b/src/tilemap/Tile.js
index f9dc1b10..e7cf8444 100644
--- a/src/tilemap/Tile.js
+++ b/src/tilemap/Tile.js
@@ -120,16 +120,16 @@ Phaser.Tile = function (layer, index, x, y, width, height) {
     this.collideDown = false;
 
     /**
-    * @property {function} callback - Tile collision callback.
+    * @property {function} collisionCallback - Tile collision callback.
     * @default
     */
-    this.callback = null;
+    this.collisionCallback = null;
 
     /**
-    * @property {object} callbackContext - The context in which the collision callback will be called.
+    * @property {object} collisionCallbackContext - The context in which the collision callback will be called.
     * @default
     */
-    this.callbackContext = this;
+    this.collisionCallbackContext = this;
 
 };
 
@@ -141,12 +141,12 @@ Phaser.Tile.prototype = {
     * 
     * @method Phaser.Tile#setCollisionCallback
     * @param {function} callback - Callback function.
-    * @param {object} context - Callback will be called with this context.
+    * @param {object} context - Callback will be called within this context.
     */
     setCollisionCallback: function (callback, context) {
 
-        this.collisionCallbackContext = context;
         this.collisionCallback = callback;
+        this.collisionCallbackContext = context;
 
     },