diff --git a/bin/easystar-0.4.3.js b/bin/easystar-0.4.3.js
index 5ccabb4..e9c45c6 100644
--- a/bin/easystar-0.4.3.js
+++ b/bin/easystar-0.4.3.js
@@ -81,6 +81,9 @@ var EasyStar =
 	    var iterationsPerCalculation = Number.MAX_VALUE;
 	    var acceptableTiles;
 	    var diagonalsEnabled = false;
+	    var isNdarrayGrid = false;
+	    var gridWidth;
+	    var gridHeight;
 
 	    /**
 	    * Sets the collision grid that EasyStar uses.
@@ -137,11 +140,20 @@ var EasyStar =
 	    this.setGrid = function (grid) {
 	        collisionGrid = grid;
 
+	        if (!Array.isArray(collisionGrid)) {
+	            isNdarrayGrid = true;
+	            gridWidth = collisionGrid.shape[0];
+	            gridHeight = collisionGrid.shape[1];
+	        } else {
+	            gridWidth = collisionGrid[0].length;
+	            gridHeight = collisionGrid.length;
+	        }
+
 	        //Setup cost map
-	        for (var y = 0; y < collisionGrid.length; y++) {
-	            for (var x = 0; x < collisionGrid[0].length; x++) {
-	                if (!costMap[collisionGrid[y][x]]) {
-	                    costMap[collisionGrid[y][x]] = 1;
+	        for (var y = 0; y < gridHeight; y++) {
+	            for (var x = 0; x < gridWidth; x++) {
+	                if (!costMap[getTileAt(x, y)]) {
+	                    costMap[getTileAt(x, y)] = 1;
 	                }
 	            }
 	        }
@@ -306,7 +318,7 @@ var EasyStar =
 	        }
 
 	        // Start or endpoint outside of scope.
-	        if (startX < 0 || startY < 0 || endX < 0 || endY < 0 || startX > collisionGrid[0].length - 1 || startY > collisionGrid.length - 1 || endX > collisionGrid[0].length - 1 || endY > collisionGrid.length - 1) {
+	        if (startX < 0 || startY < 0 || endX < 0 || endY < 0 || startX > gridWidth - 1 || startY > gridHeight - 1 || endX > gridWidth - 1 || endY > gridHeight - 1) {
 	            throw new Error("Your start or end point is outside the scope of your grid.");
 	        }
 
@@ -317,7 +329,7 @@ var EasyStar =
 	        }
 
 	        // End point is not an acceptable tile.
-	        var endTile = collisionGrid[endY][endX];
+	        var endTile = getTileAt(endX, endY);
 	        var isAcceptable = false;
 	        for (var i = 0; i < acceptableTiles.length; i++) {
 	            if (endTile === acceptableTiles[i]) {
@@ -326,7 +338,7 @@ var EasyStar =
 	            }
 	        }
 
-	        if (isAcceptable === false) {
+	        if (!isAcceptable) {
 	            callbackWrapper(null);
 	            return;
 	        }
@@ -428,10 +440,10 @@ var EasyStar =
 	            if (searchNode.y > 0) {
 	                checkAdjacentNode(instance, searchNode, 0, -1, STRAIGHT_COST * getTileCost(searchNode.x, searchNode.y - 1));
 	            }
-	            if (searchNode.x < collisionGrid[0].length - 1) {
+	            if (searchNode.x < gridWidth - 1) {
 	                checkAdjacentNode(instance, searchNode, 1, 0, STRAIGHT_COST * getTileCost(searchNode.x + 1, searchNode.y));
 	            }
-	            if (searchNode.y < collisionGrid.length - 1) {
+	            if (searchNode.y < gridHeight - 1) {
 	                checkAdjacentNode(instance, searchNode, 0, 1, STRAIGHT_COST * getTileCost(searchNode.x, searchNode.y + 1));
 	            }
 	            if (searchNode.x > 0) {
@@ -440,28 +452,28 @@ var EasyStar =
 	            if (diagonalsEnabled) {
 	                if (searchNode.x > 0 && searchNode.y > 0) {
 
-	                    if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y, searchNode)) {
+	                    if (allowCornerCutting || isTileWalkable(searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(searchNode.x - 1, searchNode.y, searchNode)) {
 
 	                        checkAdjacentNode(instance, searchNode, -1, -1, DIAGONAL_COST * getTileCost(searchNode.x - 1, searchNode.y - 1));
 	                    }
 	                }
-	                if (searchNode.x < collisionGrid[0].length - 1 && searchNode.y < collisionGrid.length - 1) {
+	                if (searchNode.x < gridWidth - 1 && searchNode.y < gridHeight - 1) {
 
-	                    if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y, searchNode)) {
+	                    if (allowCornerCutting || isTileWalkable(searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(searchNode.x + 1, searchNode.y, searchNode)) {
 
 	                        checkAdjacentNode(instance, searchNode, 1, 1, DIAGONAL_COST * getTileCost(searchNode.x + 1, searchNode.y + 1));
 	                    }
 	                }
-	                if (searchNode.x < collisionGrid[0].length - 1 && searchNode.y > 0) {
+	                if (searchNode.x < gridWidth - 1 && searchNode.y > 0) {
 
-	                    if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y, searchNode)) {
+	                    if (allowCornerCutting || isTileWalkable(searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(searchNode.x + 1, searchNode.y, searchNode)) {
 
 	                        checkAdjacentNode(instance, searchNode, 1, -1, DIAGONAL_COST * getTileCost(searchNode.x + 1, searchNode.y - 1));
 	                    }
 	                }
-	                if (searchNode.x > 0 && searchNode.y < collisionGrid.length - 1) {
+	                if (searchNode.x > 0 && searchNode.y < gridHeight - 1) {
 
-	                    if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y, searchNode)) {
+	                    if (allowCornerCutting || isTileWalkable(searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(searchNode.x - 1, searchNode.y, searchNode)) {
 
 	                        checkAdjacentNode(instance, searchNode, -1, 1, DIAGONAL_COST * getTileCost(searchNode.x - 1, searchNode.y + 1));
 	                    }
@@ -475,7 +487,7 @@ var EasyStar =
 	        var adjacentCoordinateX = searchNode.x + x;
 	        var adjacentCoordinateY = searchNode.y + y;
 
-	        if ((pointsToAvoid[adjacentCoordinateY] === undefined || pointsToAvoid[adjacentCoordinateY][adjacentCoordinateX] === undefined) && isTileWalkable(collisionGrid, acceptableTiles, adjacentCoordinateX, adjacentCoordinateY, searchNode)) {
+	        if ((pointsToAvoid[adjacentCoordinateY] === undefined || pointsToAvoid[adjacentCoordinateY][adjacentCoordinateX] === undefined) && isTileWalkable(adjacentCoordinateX, adjacentCoordinateY, searchNode)) {
 	            var node = coordinateToNode(instance, adjacentCoordinateX, adjacentCoordinateY, searchNode, cost);
 
 	            if (node.list === undefined) {
@@ -490,7 +502,7 @@ var EasyStar =
 	    };
 
 	    // Helpers
-	    var isTileWalkable = function (collisionGrid, acceptableTiles, x, y, sourceNode) {
+	    var isTileWalkable = function (x, y, sourceNode) {
 	        var directionalCondition = directionalConditions[y] && directionalConditions[y][x];
 	        if (directionalCondition) {
 	            var direction = calculateDirection(sourceNode.x - x, sourceNode.y - y);
@@ -503,7 +515,7 @@ var EasyStar =
 	            if (!directionIncluded()) return false;
 	        }
 	        for (var i = 0; i < acceptableTiles.length; i++) {
-	            if (collisionGrid[y][x] === acceptableTiles[i]) {
+	            if (getTileAt(x, y) === acceptableTiles[i]) {
 	                return true;
 	            }
 	        }
@@ -522,7 +534,7 @@ var EasyStar =
 	    };
 
 	    var getTileCost = function (x, y) {
-	        return pointsToCost[y] && pointsToCost[y][x] || costMap[collisionGrid[y][x]];
+	        return pointsToCost[y] && pointsToCost[y][x] || costMap[getTileAt(x, y)];
 	    };
 
 	    var coordinateToNode = function (instance, x, y, parent, cost) {
@@ -561,6 +573,10 @@ var EasyStar =
 	            return dx + dy;
 	        }
 	    };
+
+	    var getTileAt = function (x, y) {
+	        return isNdarrayGrid ? +collisionGrid.get(x, y) : +collisionGrid[y][x];
+	    };
 	};
 
 	EasyStar.TOP = 'TOP';
diff --git a/bin/easystar-0.4.3.min.js b/bin/easystar-0.4.3.min.js
index 164e752..1019e2c 100644
--- a/bin/easystar-0.4.3.min.js
+++ b/bin/easystar-0.4.3.min.js
@@ -1 +1 @@
-var EasyStar=function(t){function n(o){if(e[o])return e[o].exports;var r=e[o]={exports:{},id:o,loaded:!1};return t[o].call(r.exports,r,r.exports,n),r.loaded=!0,r.exports}var e={};return n.m=t,n.c=e,n.p="",n(0)}([function(t,n,e){var o={},r=e(1),i=e(2),s=e(3);const u=0,a=1;t.exports=o;var l=1;o.js=function(){var t,n,e,c=1,f=1.4,h=!1,p={},d={},v={},y={},T=!0,g={},x=[],O=Number.MAX_VALUE,b=!1;this.setAcceptableTiles=function(t){t instanceof Array?e=t:!isNaN(parseFloat(t))&&isFinite(t)&&(e=[t])},this.enableSync=function(){h=!0},this.disableSync=function(){h=!1},this.enableDiagonals=function(){b=!0},this.disableDiagonals=function(){b=!1},this.setGrid=function(n){t=n;for(var e=0;e<t.length;e++)for(var o=0;o<t[0].length;o++)d[t[e][o]]||(d[t[e][o]]=1)},this.setTileCost=function(t,n){d[t]=n},this.setAdditionalPointCost=function(t,n,e){void 0===v[n]&&(v[n]={}),v[n][t]=e},this.removeAdditionalPointCost=function(t,n){void 0!==v[n]&&delete v[n][t]},this.removeAllAdditionalPointCosts=function(){v={}},this.setDirectionalCondition=function(t,n,e){void 0===y[n]&&(y[n]={}),y[n][t]=e},this.removeAllDirectionalConditions=function(){y={}},this.setIterationsPerCalculation=function(t){O=t},this.avoidAdditionalPoint=function(t,n){void 0===p[n]&&(p[n]={}),p[n][t]=1},this.stopAvoidingAdditionalPoint=function(t,n){void 0!==p[n]&&delete p[n][t]},this.enableCornerCutting=function(){T=!0},this.disableCornerCutting=function(){T=!1},this.stopAvoidingAllAdditionalPoints=function(){p={}},this.findPath=function(n,o,i,u,a){var f=function(t){h?a(t):setTimeout(function(){a(t)})};if(void 0===e)throw new Error("You can't set a path without first calling setAcceptableTiles() on EasyStar.");if(void 0===t)throw new Error("You can't set a path without first calling setGrid() on EasyStar.");if(n<0||o<0||i<0||u<0||n>t[0].length-1||o>t.length-1||i>t[0].length-1||u>t.length-1)throw new Error("Your start or end point is outside the scope of your grid.");if(n===i&&o===u)return void f([]);for(var p=t[u][i],d=!1,v=0;v<e.length;v++)if(p===e[v]){d=!0;break}if(d===!1)return void f(null);var y=new r;y.openList=new s(function(t,n){return t.bestGuessDistance()-n.bestGuessDistance()}),y.isDoneCalculating=!1,y.nodeHash={},y.startX=n,y.startY=o,y.endX=i,y.endY=u,y.callback=f,y.openList.push(P(y,y.startX,y.startY,null,c));var T=l++;return g[T]=y,x.push(T),T},this.cancelPath=function(t){return t in g&&(delete g[t],!0)},this.calculate=function(){if(0!==x.length&&void 0!==t&&void 0!==e)for(n=0;n<O;n++){if(0===x.length)return;h&&(n=0);var o=x[0],r=g[o];if("undefined"!=typeof r)if(0!==r.openList.size()){var i=r.openList.pop();if(r.endX!==i.x||r.endY!==i.y)i.list=u,i.y>0&&m(r,i,0,-1,c*F(i.x,i.y-1)),i.x<t[0].length-1&&m(r,i,1,0,c*F(i.x+1,i.y)),i.y<t.length-1&&m(r,i,0,1,c*F(i.x,i.y+1)),i.x>0&&m(r,i,-1,0,c*F(i.x-1,i.y)),b&&(i.x>0&&i.y>0&&(T||A(t,e,i.x,i.y-1,i)&&A(t,e,i.x-1,i.y,i))&&m(r,i,-1,-1,f*F(i.x-1,i.y-1)),i.x<t[0].length-1&&i.y<t.length-1&&(T||A(t,e,i.x,i.y+1,i)&&A(t,e,i.x+1,i.y,i))&&m(r,i,1,1,f*F(i.x+1,i.y+1)),i.x<t[0].length-1&&i.y>0&&(T||A(t,e,i.x,i.y-1,i)&&A(t,e,i.x+1,i.y,i))&&m(r,i,1,-1,f*F(i.x+1,i.y-1)),i.x>0&&i.y<t.length-1&&(T||A(t,e,i.x,i.y+1,i)&&A(t,e,i.x-1,i.y,i))&&m(r,i,-1,1,f*F(i.x-1,i.y+1)));else{var s=[];s.push({x:i.x,y:i.y});for(var a=i.parent;null!=a;)s.push({x:a.x,y:a.y}),a=a.parent;s.reverse();var l=s;r.callback(l),delete g[o],x.shift()}}else r.callback(null),delete g[o],x.shift();else x.shift()}};var m=function(n,o,r,i,s){var u=o.x+r,l=o.y+i;if((void 0===p[l]||void 0===p[l][u])&&A(t,e,u,l,o)){var c=P(n,u,l,o,s);void 0===c.list?(c.list=a,n.openList.push(c)):o.costSoFar+s<c.costSoFar&&(c.costSoFar=o.costSoFar+s,c.parent=o,n.openList.updateItem(c))}},A=function(t,n,e,o,r){var i=y[o]&&y[o][e];if(i){var s=E(r.x-e,r.y-o),u=function(){for(var t=0;t<i.length;t++)if(i[t]===s)return!0;return!1};if(!u())return!1}for(var a=0;a<n.length;a++)if(t[o][e]===n[a])return!0;return!1},E=function(t,n){if(0===t&&n===-1)return o.TOP;if(1===t&&n===-1)return o.TOP_RIGHT;if(1===t&&0===n)return o.RIGHT;if(1===t&&1===n)return o.BOTTOM_RIGHT;if(0===t&&1===n)return o.BOTTOM;if(t===-1&&1===n)return o.BOTTOM_LEFT;if(t===-1&&0===n)return o.LEFT;if(t===-1&&n===-1)return o.TOP_LEFT;throw new Error("These differences are not valid: "+t+", "+n)},F=function(n,e){return v[e]&&v[e][n]||d[t[e][n]]},P=function(t,n,e,o,r){if(void 0!==t.nodeHash[e]){if(void 0!==t.nodeHash[e][n])return t.nodeHash[e][n]}else t.nodeHash[e]={};var s=L(n,e,t.endX,t.endY);if(null!==o)var u=o.costSoFar+r;else u=0;var a=new i(o,n,e,u,s);return t.nodeHash[e][n]=a,a},L=function(t,n,e,o){if(b){var r=Math.abs(t-e),i=Math.abs(n-o);return r<i?f*r+i:f*i+r}var r=Math.abs(t-e),i=Math.abs(n-o);return r+i}},o.TOP="TOP",o.TOP_RIGHT="TOP_RIGHT",o.RIGHT="RIGHT",o.BOTTOM_RIGHT="BOTTOM_RIGHT",o.BOTTOM="BOTTOM",o.BOTTOM_LEFT="BOTTOM_LEFT",o.LEFT="LEFT",o.TOP_LEFT="TOP_LEFT"},function(t,n){t.exports=function(){this.pointsToAvoid={},this.startX,this.callback,this.startY,this.endX,this.endY,this.nodeHash={},this.openList}},function(t,n){t.exports=function(t,n,e,o,r){this.parent=t,this.x=n,this.y=e,this.costSoFar=o,this.simpleDistanceToTarget=r,this.bestGuessDistance=function(){return this.costSoFar+this.simpleDistanceToTarget}}},function(t,n,e){t.exports=e(4)},function(t,n,e){var o,r,i;(function(){var e,s,u,a,l,c,f,h,p,d,v,y,T,g,x;u=Math.floor,d=Math.min,s=function(t,n){return t<n?-1:t>n?1:0},p=function(t,n,e,o,r){var i;if(null==e&&(e=0),null==r&&(r=s),e<0)throw new Error("lo must be non-negative");for(null==o&&(o=t.length);e<o;)i=u((e+o)/2),r(n,t[i])<0?o=i:e=i+1;return[].splice.apply(t,[e,e-e].concat(n)),n},c=function(t,n,e){return null==e&&(e=s),t.push(n),g(t,0,t.length-1,e)},l=function(t,n){var e,o;return null==n&&(n=s),e=t.pop(),t.length?(o=t[0],t[0]=e,x(t,0,n)):o=e,o},h=function(t,n,e){var o;return null==e&&(e=s),o=t[0],t[0]=n,x(t,0,e),o},f=function(t,n,e){var o;return null==e&&(e=s),t.length&&e(t[0],n)<0&&(o=[t[0],n],n=o[0],t[0]=o[1],x(t,0,e)),n},a=function(t,n){var e,o,r,i,a,l;for(null==n&&(n=s),i=function(){l=[];for(var n=0,e=u(t.length/2);0<=e?n<e:n>e;0<=e?n++:n--)l.push(n);return l}.apply(this).reverse(),a=[],o=0,r=i.length;o<r;o++)e=i[o],a.push(x(t,e,n));return a},T=function(t,n,e){var o;if(null==e&&(e=s),o=t.indexOf(n),o!==-1)return g(t,0,o,e),x(t,o,e)},v=function(t,n,e){var o,r,i,u,l;if(null==e&&(e=s),r=t.slice(0,n),!r.length)return r;for(a(r,e),l=t.slice(n),i=0,u=l.length;i<u;i++)o=l[i],f(r,o,e);return r.sort(e).reverse()},y=function(t,n,e){var o,r,i,u,c,f,h,v,y,T;if(null==e&&(e=s),10*n<=t.length){if(u=t.slice(0,n).sort(e),!u.length)return u;for(i=u[u.length-1],v=t.slice(n),c=0,h=v.length;c<h;c++)o=v[c],e(o,i)<0&&(p(u,o,0,null,e),u.pop(),i=u[u.length-1]);return u}for(a(t,e),T=[],r=f=0,y=d(n,t.length);0<=y?f<y:f>y;r=0<=y?++f:--f)T.push(l(t,e));return T},g=function(t,n,e,o){var r,i,u;for(null==o&&(o=s),r=t[e];e>n&&(u=e-1>>1,i=t[u],o(r,i)<0);)t[e]=i,e=u;return t[e]=r},x=function(t,n,e){var o,r,i,u,a;for(null==e&&(e=s),r=t.length,a=n,i=t[n],o=2*n+1;o<r;)u=o+1,u<r&&!(e(t[o],t[u])<0)&&(o=u),t[n]=t[o],n=o,o=2*n+1;return t[n]=i,g(t,a,n,e)},e=function(){function t(t){this.cmp=null!=t?t:s,this.nodes=[]}return t.push=c,t.pop=l,t.replace=h,t.pushpop=f,t.heapify=a,t.updateItem=T,t.nlargest=v,t.nsmallest=y,t.prototype.push=function(t){return c(this.nodes,t,this.cmp)},t.prototype.pop=function(){return l(this.nodes,this.cmp)},t.prototype.peek=function(){return this.nodes[0]},t.prototype.contains=function(t){return this.nodes.indexOf(t)!==-1},t.prototype.replace=function(t){return h(this.nodes,t,this.cmp)},t.prototype.pushpop=function(t){return f(this.nodes,t,this.cmp)},t.prototype.heapify=function(){return a(this.nodes,this.cmp)},t.prototype.updateItem=function(t){return T(this.nodes,t,this.cmp)},t.prototype.clear=function(){return this.nodes=[]},t.prototype.empty=function(){return 0===this.nodes.length},t.prototype.size=function(){return this.nodes.length},t.prototype.clone=function(){var n;return n=new t,n.nodes=this.nodes.slice(0),n},t.prototype.toArray=function(){return this.nodes.slice(0)},t.prototype.insert=t.prototype.push,t.prototype.top=t.prototype.peek,t.prototype.front=t.prototype.peek,t.prototype.has=t.prototype.contains,t.prototype.copy=t.prototype.clone,t}(),function(e,s){return r=[],o=s,i="function"==typeof o?o.apply(n,r):o,!(void 0!==i&&(t.exports=i))}(this,function(){return e})}).call(this)}]);
\ No newline at end of file
+var EasyStar=function(t){function n(r){if(e[r])return e[r].exports;var o=e[r]={exports:{},id:r,loaded:!1};return t[r].call(o.exports,o,o.exports,n),o.loaded=!0,o.exports}var e={};return n.m=t,n.c=e,n.p="",n(0)}([function(t,n,e){var r={},o=e(1),i=e(2),s=e(3);const u=0,a=1;t.exports=r;var l=1;r.js=function(){var t,n,e,c,f,p=1,h=1.4,d=!1,v={},y={},T={},x={},g=!0,O={},b=[],m=Number.MAX_VALUE,A=!1,E=!1;this.setAcceptableTiles=function(t){t instanceof Array?e=t:!isNaN(parseFloat(t))&&isFinite(t)&&(e=[t])},this.enableSync=function(){d=!0},this.disableSync=function(){d=!1},this.enableDiagonals=function(){A=!0},this.disableDiagonals=function(){A=!1},this.setGrid=function(n){t=n,Array.isArray(t)?(c=t[0].length,f=t.length):(E=!0,c=t.shape[0],f=t.shape[1]);for(var e=0;e<f;e++)for(var r=0;r<c;r++)y[G(r,e)]||(y[G(r,e)]=1)},this.setTileCost=function(t,n){y[t]=n},this.setAdditionalPointCost=function(t,n,e){void 0===T[n]&&(T[n]={}),T[n][t]=e},this.removeAdditionalPointCost=function(t,n){void 0!==T[n]&&delete T[n][t]},this.removeAllAdditionalPointCosts=function(){T={}},this.setDirectionalCondition=function(t,n,e){void 0===x[n]&&(x[n]={}),x[n][t]=e},this.removeAllDirectionalConditions=function(){x={}},this.setIterationsPerCalculation=function(t){m=t},this.avoidAdditionalPoint=function(t,n){void 0===v[n]&&(v[n]={}),v[n][t]=1},this.stopAvoidingAdditionalPoint=function(t,n){void 0!==v[n]&&delete v[n][t]},this.enableCornerCutting=function(){g=!0},this.disableCornerCutting=function(){g=!1},this.stopAvoidingAllAdditionalPoints=function(){v={}},this.findPath=function(n,r,i,u,a){var h=function(t){d?a(t):setTimeout(function(){a(t)})};if(void 0===e)throw new Error("You can't set a path without first calling setAcceptableTiles() on EasyStar.");if(void 0===t)throw new Error("You can't set a path without first calling setGrid() on EasyStar.");if(n<0||r<0||i<0||u<0||n>c-1||r>f-1||i>c-1||u>f-1)throw new Error("Your start or end point is outside the scope of your grid.");if(n===i&&r===u)return void h([]);for(var v=G(i,u),y=!1,T=0;T<e.length;T++)if(v===e[T]){y=!0;break}if(!y)return void h(null);var x=new o;x.openList=new s(function(t,n){return t.bestGuessDistance()-n.bestGuessDistance()}),x.isDoneCalculating=!1,x.nodeHash={},x.startX=n,x.startY=r,x.endX=i,x.endY=u,x.callback=h,x.openList.push(H(x,x.startX,x.startY,null,p));var g=l++;return O[g]=x,b.push(g),g},this.cancelPath=function(t){return t in O&&(delete O[t],!0)},this.calculate=function(){if(0!==b.length&&void 0!==t&&void 0!==e)for(n=0;n<m;n++){if(0===b.length)return;d&&(n=0);var r=b[0],o=O[r];if("undefined"!=typeof o)if(0!==o.openList.size()){var i=o.openList.pop();if(o.endX!==i.x||o.endY!==i.y)i.list=u,i.y>0&&F(o,i,0,-1,p*w(i.x,i.y-1)),i.x<c-1&&F(o,i,1,0,p*w(i.x+1,i.y)),i.y<f-1&&F(o,i,0,1,p*w(i.x,i.y+1)),i.x>0&&F(o,i,-1,0,p*w(i.x-1,i.y)),A&&(i.x>0&&i.y>0&&(g||P(i.x,i.y-1,i)&&P(i.x-1,i.y,i))&&F(o,i,-1,-1,h*w(i.x-1,i.y-1)),i.x<c-1&&i.y<f-1&&(g||P(i.x,i.y+1,i)&&P(i.x+1,i.y,i))&&F(o,i,1,1,h*w(i.x+1,i.y+1)),i.x<c-1&&i.y>0&&(g||P(i.x,i.y-1,i)&&P(i.x+1,i.y,i))&&F(o,i,1,-1,h*w(i.x+1,i.y-1)),i.x>0&&i.y<f-1&&(g||P(i.x,i.y+1,i)&&P(i.x-1,i.y,i))&&F(o,i,-1,1,h*w(i.x-1,i.y+1)));else{var s=[];s.push({x:i.x,y:i.y});for(var a=i.parent;null!=a;)s.push({x:a.x,y:a.y}),a=a.parent;s.reverse();var l=s;o.callback(l),delete O[r],b.shift()}}else o.callback(null),delete O[r],b.shift();else b.shift()}};var F=function(t,n,e,r,o){var i=n.x+e,s=n.y+r;if((void 0===v[s]||void 0===v[s][i])&&P(i,s,n)){var u=H(t,i,s,n,o);void 0===u.list?(u.list=a,t.openList.push(u)):n.costSoFar+o<u.costSoFar&&(u.costSoFar=n.costSoFar+o,u.parent=n,t.openList.updateItem(u))}},P=function(t,n,r){var o=x[n]&&x[n][t];if(o){var i=L(r.x-t,r.y-n),s=function(){for(var t=0;t<o.length;t++)if(o[t]===i)return!0;return!1};if(!s())return!1}for(var u=0;u<e.length;u++)if(G(t,n)===e[u])return!0;return!1},L=function(t,n){if(0===t&&n===-1)return r.TOP;if(1===t&&n===-1)return r.TOP_RIGHT;if(1===t&&0===n)return r.RIGHT;if(1===t&&1===n)return r.BOTTOM_RIGHT;if(0===t&&1===n)return r.BOTTOM;if(t===-1&&1===n)return r.BOTTOM_LEFT;if(t===-1&&0===n)return r.LEFT;if(t===-1&&n===-1)return r.TOP_LEFT;throw new Error("These differences are not valid: "+t+", "+n)},w=function(t,n){return T[n]&&T[n][t]||y[G(t,n)]},H=function(t,n,e,r,o){if(void 0!==t.nodeHash[e]){if(void 0!==t.nodeHash[e][n])return t.nodeHash[e][n]}else t.nodeHash[e]={};var s=M(n,e,t.endX,t.endY);if(null!==r)var u=r.costSoFar+o;else u=0;var a=new i(r,n,e,u,s);return t.nodeHash[e][n]=a,a},M=function(t,n,e,r){if(A){var o=Math.abs(t-e),i=Math.abs(n-r);return o<i?h*o+i:h*i+o}var o=Math.abs(t-e),i=Math.abs(n-r);return o+i},G=function(n,e){return E?+t.get(n,e):+t[e][n]}},r.TOP="TOP",r.TOP_RIGHT="TOP_RIGHT",r.RIGHT="RIGHT",r.BOTTOM_RIGHT="BOTTOM_RIGHT",r.BOTTOM="BOTTOM",r.BOTTOM_LEFT="BOTTOM_LEFT",r.LEFT="LEFT",r.TOP_LEFT="TOP_LEFT"},function(t,n){t.exports=function(){this.pointsToAvoid={},this.startX,this.callback,this.startY,this.endX,this.endY,this.nodeHash={},this.openList}},function(t,n){t.exports=function(t,n,e,r,o){this.parent=t,this.x=n,this.y=e,this.costSoFar=r,this.simpleDistanceToTarget=o,this.bestGuessDistance=function(){return this.costSoFar+this.simpleDistanceToTarget}}},function(t,n,e){t.exports=e(4)},function(t,n,e){var r,o,i;(function(){var e,s,u,a,l,c,f,p,h,d,v,y,T,x,g;u=Math.floor,d=Math.min,s=function(t,n){return t<n?-1:t>n?1:0},h=function(t,n,e,r,o){var i;if(null==e&&(e=0),null==o&&(o=s),e<0)throw new Error("lo must be non-negative");for(null==r&&(r=t.length);e<r;)i=u((e+r)/2),o(n,t[i])<0?r=i:e=i+1;return[].splice.apply(t,[e,e-e].concat(n)),n},c=function(t,n,e){return null==e&&(e=s),t.push(n),x(t,0,t.length-1,e)},l=function(t,n){var e,r;return null==n&&(n=s),e=t.pop(),t.length?(r=t[0],t[0]=e,g(t,0,n)):r=e,r},p=function(t,n,e){var r;return null==e&&(e=s),r=t[0],t[0]=n,g(t,0,e),r},f=function(t,n,e){var r;return null==e&&(e=s),t.length&&e(t[0],n)<0&&(r=[t[0],n],n=r[0],t[0]=r[1],g(t,0,e)),n},a=function(t,n){var e,r,o,i,a,l;for(null==n&&(n=s),i=function(){l=[];for(var n=0,e=u(t.length/2);0<=e?n<e:n>e;0<=e?n++:n--)l.push(n);return l}.apply(this).reverse(),a=[],r=0,o=i.length;r<o;r++)e=i[r],a.push(g(t,e,n));return a},T=function(t,n,e){var r;if(null==e&&(e=s),r=t.indexOf(n),r!==-1)return x(t,0,r,e),g(t,r,e)},v=function(t,n,e){var r,o,i,u,l;if(null==e&&(e=s),o=t.slice(0,n),!o.length)return o;for(a(o,e),l=t.slice(n),i=0,u=l.length;i<u;i++)r=l[i],f(o,r,e);return o.sort(e).reverse()},y=function(t,n,e){var r,o,i,u,c,f,p,v,y,T;if(null==e&&(e=s),10*n<=t.length){if(u=t.slice(0,n).sort(e),!u.length)return u;for(i=u[u.length-1],v=t.slice(n),c=0,p=v.length;c<p;c++)r=v[c],e(r,i)<0&&(h(u,r,0,null,e),u.pop(),i=u[u.length-1]);return u}for(a(t,e),T=[],o=f=0,y=d(n,t.length);0<=y?f<y:f>y;o=0<=y?++f:--f)T.push(l(t,e));return T},x=function(t,n,e,r){var o,i,u;for(null==r&&(r=s),o=t[e];e>n&&(u=e-1>>1,i=t[u],r(o,i)<0);)t[e]=i,e=u;return t[e]=o},g=function(t,n,e){var r,o,i,u,a;for(null==e&&(e=s),o=t.length,a=n,i=t[n],r=2*n+1;r<o;)u=r+1,u<o&&!(e(t[r],t[u])<0)&&(r=u),t[n]=t[r],n=r,r=2*n+1;return t[n]=i,x(t,a,n,e)},e=function(){function t(t){this.cmp=null!=t?t:s,this.nodes=[]}return t.push=c,t.pop=l,t.replace=p,t.pushpop=f,t.heapify=a,t.updateItem=T,t.nlargest=v,t.nsmallest=y,t.prototype.push=function(t){return c(this.nodes,t,this.cmp)},t.prototype.pop=function(){return l(this.nodes,this.cmp)},t.prototype.peek=function(){return this.nodes[0]},t.prototype.contains=function(t){return this.nodes.indexOf(t)!==-1},t.prototype.replace=function(t){return p(this.nodes,t,this.cmp)},t.prototype.pushpop=function(t){return f(this.nodes,t,this.cmp)},t.prototype.heapify=function(){return a(this.nodes,this.cmp)},t.prototype.updateItem=function(t){return T(this.nodes,t,this.cmp)},t.prototype.clear=function(){return this.nodes=[]},t.prototype.empty=function(){return 0===this.nodes.length},t.prototype.size=function(){return this.nodes.length},t.prototype.clone=function(){var n;return n=new t,n.nodes=this.nodes.slice(0),n},t.prototype.toArray=function(){return this.nodes.slice(0)},t.prototype.insert=t.prototype.push,t.prototype.top=t.prototype.peek,t.prototype.front=t.prototype.peek,t.prototype.has=t.prototype.contains,t.prototype.copy=t.prototype.clone,t}(),function(e,s){return o=[],r=s,i="function"==typeof r?r.apply(n,o):r,!(void 0!==i&&(t.exports=i))}(this,function(){return e})}).call(this)}]);
\ No newline at end of file
diff --git a/src/easystar.js b/src/easystar.js
index 8323066..04bdf42 100755
--- a/src/easystar.js
+++ b/src/easystar.js
@@ -34,6 +34,9 @@ EasyStar.js = function() {
     var iterationsPerCalculation = Number.MAX_VALUE;
     var acceptableTiles;
     var diagonalsEnabled = false;
+    var isNdarrayGrid = false;
+    var gridWidth;
+    var gridHeight;
 
     /**
     * Sets the collision grid that EasyStar uses.
@@ -90,11 +93,20 @@ EasyStar.js = function() {
     this.setGrid = function(grid) {
         collisionGrid = grid;
 
+        if (!Array.isArray(collisionGrid)) {
+            isNdarrayGrid = true;
+            gridWidth = collisionGrid.shape[0];
+            gridHeight = collisionGrid.shape[1];
+        } else {
+            gridWidth = collisionGrid[0].length;
+            gridHeight = collisionGrid.length;
+        }
+
         //Setup cost map
-        for (var y = 0; y < collisionGrid.length; y++) {
-            for (var x = 0; x < collisionGrid[0].length; x++) {
-                if (!costMap[collisionGrid[y][x]]) {
-                    costMap[collisionGrid[y][x]] = 1
+        for (var y = 0; y < gridHeight; y++) {
+            for (var x = 0; x < gridWidth; x++) {
+                if (!costMap[getTileAt(x, y)]) {
+                    costMap[getTileAt(x, y)] = 1;
                 }
             }
         }
@@ -260,8 +272,8 @@ EasyStar.js = function() {
 
         // Start or endpoint outside of scope.
         if (startX < 0 || startY < 0 || endX < 0 || endY < 0 ||
-        startX > collisionGrid[0].length-1 || startY > collisionGrid.length-1 ||
-        endX > collisionGrid[0].length-1 || endY > collisionGrid.length-1) {
+        startX > gridWidth-1 || startY > gridHeight-1 ||
+        endX > gridWidth-1 || endY > gridHeight-1) {
             throw new Error("Your start or end point is outside the scope of your grid.");
         }
 
@@ -272,7 +284,7 @@ EasyStar.js = function() {
         }
 
         // End point is not an acceptable tile.
-        var endTile = collisionGrid[endY][endX];
+        var endTile = getTileAt(endX, endY);
         var isAcceptable = false;
         for (var i = 0; i < acceptableTiles.length; i++) {
             if (endTile === acceptableTiles[i]) {
@@ -281,7 +293,7 @@ EasyStar.js = function() {
             }
         }
 
-        if (isAcceptable === false) {
+        if (!isAcceptable) {
             callbackWrapper(null);
             return;
         }
@@ -368,7 +380,7 @@ EasyStar.js = function() {
                 path.push({x: searchNode.x, y: searchNode.y});
                 var parent = searchNode.parent;
                 while (parent!=null) {
-                    path.push({x: parent.x, y:parent.y});
+                    path.push({x: parent.x, y: parent.y});
                     parent = parent.parent;
                 }
                 path.reverse();
@@ -385,11 +397,11 @@ EasyStar.js = function() {
                 checkAdjacentNode(instance, searchNode,
                     0, -1, STRAIGHT_COST * getTileCost(searchNode.x, searchNode.y-1));
             }
-            if (searchNode.x < collisionGrid[0].length-1) {
+            if (searchNode.x < gridWidth-1) {
                 checkAdjacentNode(instance, searchNode,
                     1, 0, STRAIGHT_COST * getTileCost(searchNode.x+1, searchNode.y));
             }
-            if (searchNode.y < collisionGrid.length-1) {
+            if (searchNode.y < gridHeight-1) {
                 checkAdjacentNode(instance, searchNode,
                     0, 1, STRAIGHT_COST * getTileCost(searchNode.x, searchNode.y+1));
             }
@@ -401,38 +413,38 @@ EasyStar.js = function() {
                 if (searchNode.x > 0 && searchNode.y > 0) {
 
                     if (allowCornerCutting ||
-                        (isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y-1, searchNode) &&
-                        isTileWalkable(collisionGrid, acceptableTiles, searchNode.x-1, searchNode.y, searchNode))) {
+                        (isTileWalkable(searchNode.x, searchNode.y-1, searchNode) &&
+                        isTileWalkable(searchNode.x-1, searchNode.y, searchNode))) {
 
                         checkAdjacentNode(instance, searchNode,
                             -1, -1, DIAGONAL_COST * getTileCost(searchNode.x-1, searchNode.y-1));
                     }
                 }
-                if (searchNode.x < collisionGrid[0].length-1 && searchNode.y < collisionGrid.length-1) {
+                if (searchNode.x < gridWidth-1 && searchNode.y < gridHeight-1) {
 
                     if (allowCornerCutting ||
-                        (isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y+1, searchNode) &&
-                        isTileWalkable(collisionGrid, acceptableTiles, searchNode.x+1, searchNode.y, searchNode))) {
+                        (isTileWalkable(searchNode.x, searchNode.y+1, searchNode) &&
+                        isTileWalkable(searchNode.x+1, searchNode.y, searchNode))) {
 
                         checkAdjacentNode(instance, searchNode,
                             1, 1, DIAGONAL_COST * getTileCost(searchNode.x+1, searchNode.y+1));
                     }
                 }
-                if (searchNode.x < collisionGrid[0].length-1 && searchNode.y > 0) {
+                if (searchNode.x < gridWidth-1 && searchNode.y > 0) {
 
                     if (allowCornerCutting ||
-                        (isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y-1, searchNode) &&
-                        isTileWalkable(collisionGrid, acceptableTiles, searchNode.x+1, searchNode.y, searchNode))) {
+                        (isTileWalkable(searchNode.x, searchNode.y-1, searchNode) &&
+                        isTileWalkable(searchNode.x+1, searchNode.y, searchNode))) {
 
                         checkAdjacentNode(instance, searchNode,
                             1, -1, DIAGONAL_COST * getTileCost(searchNode.x+1, searchNode.y-1));
                     }
                 }
-                if (searchNode.x > 0 && searchNode.y < collisionGrid.length-1) {
+                if (searchNode.x > 0 && searchNode.y < gridHeight-1) {
 
                     if (allowCornerCutting ||
-                        (isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y+1, searchNode) &&
-                        isTileWalkable(collisionGrid, acceptableTiles, searchNode.x-1, searchNode.y, searchNode))) {
+                        (isTileWalkable(searchNode.x, searchNode.y+1, searchNode) &&
+                        isTileWalkable(searchNode.x-1, searchNode.y, searchNode))) {
 
                         checkAdjacentNode(instance, searchNode,
                             -1, 1, DIAGONAL_COST * getTileCost(searchNode.x-1, searchNode.y+1));
@@ -450,7 +462,7 @@ EasyStar.js = function() {
 
         if ((pointsToAvoid[adjacentCoordinateY] === undefined ||
              pointsToAvoid[adjacentCoordinateY][adjacentCoordinateX] === undefined) &&
-            isTileWalkable(collisionGrid, acceptableTiles, adjacentCoordinateX, adjacentCoordinateY, searchNode)) {
+            isTileWalkable(adjacentCoordinateX, adjacentCoordinateY, searchNode)) {
             var node = coordinateToNode(instance, adjacentCoordinateX,
                 adjacentCoordinateY, searchNode, cost);
 
@@ -466,20 +478,20 @@ EasyStar.js = function() {
     };
 
     // Helpers
-    var isTileWalkable = function(collisionGrid, acceptableTiles, x, y, sourceNode) {
+    var isTileWalkable = function(x, y, sourceNode) {
         var directionalCondition = directionalConditions[y] && directionalConditions[y][x];
         if (directionalCondition) {
             var direction = calculateDirection(sourceNode.x - x, sourceNode.y - y)
             var directionIncluded = function () {
                 for (var i = 0; i < directionalCondition.length; i++) {
-                    if (directionalCondition[i] === direction) return true
+                    if (directionalCondition[i] === direction) return true;
                 }
-                return false
+                return false;
             }
-            if (!directionIncluded()) return false
+            if (!directionIncluded()) return false;
         }
         for (var i = 0; i < acceptableTiles.length; i++) {
-            if (collisionGrid[y][x] === acceptableTiles[i]) {
+            if (getTileAt(x, y) === acceptableTiles[i]) {
                 return true;
             }
         }
@@ -493,19 +505,19 @@ EasyStar.js = function() {
      * -1,  1 | 0,  1  | 1,  1
      */
     var calculateDirection = function (diffX, diffY) {
-        if (diffX === 0 && diffY === -1) return EasyStar.TOP
-        else if (diffX === 1 && diffY === -1) return EasyStar.TOP_RIGHT
-        else if (diffX === 1 && diffY === 0) return EasyStar.RIGHT
-        else if (diffX === 1 && diffY === 1) return EasyStar.BOTTOM_RIGHT
-        else if (diffX === 0 && diffY === 1) return EasyStar.BOTTOM
-        else if (diffX === -1 && diffY === 1) return EasyStar.BOTTOM_LEFT
-        else if (diffX === -1 && diffY === 0) return EasyStar.LEFT
-        else if (diffX === -1 && diffY === -1) return EasyStar.TOP_LEFT
-        throw new Error('These differences are not valid: ' + diffX + ', ' + diffY)
+        if (diffX === 0 && diffY === -1) return EasyStar.TOP;
+        else if (diffX === 1 && diffY === -1) return EasyStar.TOP_RIGHT;
+        else if (diffX === 1 && diffY === 0) return EasyStar.RIGHT;
+        else if (diffX === 1 && diffY === 1) return EasyStar.BOTTOM_RIGHT;
+        else if (diffX === 0 && diffY === 1) return EasyStar.BOTTOM;
+        else if (diffX === -1 && diffY === 1) return EasyStar.BOTTOM_LEFT;
+        else if (diffX === -1 && diffY === 0) return EasyStar.LEFT;
+        else if (diffX === -1 && diffY === -1) return EasyStar.TOP_LEFT;
+        throw new Error('These differences are not valid: ' + diffX + ', ' + diffY);
     };
 
     var getTileCost = function(x, y) {
-        return (pointsToCost[y] && pointsToCost[y][x]) || costMap[collisionGrid[y][x]]
+        return (pointsToCost[y] && pointsToCost[y][x]) || costMap[getTileAt(x, y)];
     };
 
     var coordinateToNode = function(instance, x, y, parent, cost) {
@@ -522,12 +534,12 @@ EasyStar.js = function() {
         } else {
             costSoFar = 0;
         }
-        var node = new Node(parent,x,y,costSoFar,simpleDistanceToTarget);
+        var node = new Node(parent, x, y, costSoFar, simpleDistanceToTarget);
         instance.nodeHash[y][x] = node;
         return node;
     };
 
-    var getDistance = function(x1,y1,x2,y2) {
+    var getDistance = function(x1, y1, x2, y2) {
         if (diagonalsEnabled) {
             // Octile distance
             var dx = Math.abs(x1 - x2);
@@ -544,6 +556,10 @@ EasyStar.js = function() {
             return (dx + dy);
         }
     };
+
+    var getTileAt = function(x, y) {
+        return isNdarrayGrid ? +collisionGrid.get(x, y) : +collisionGrid[y][x];
+    };
 }
 
 EasyStar.TOP = 'TOP'