diff --git a/Scripts/2D/Tilemaps/RandomTiles.cs b/Scripts/2D/Tilemaps/RandomTiles.cs
index 1885928..92644c1 100644
--- a/Scripts/2D/Tilemaps/RandomTiles.cs
+++ b/Scripts/2D/Tilemaps/RandomTiles.cs
@@ -1,33 +1,71 @@
-// Requires: Unity 5.5.0a1 or later
-// Fills tilemap with random tiles
-// Usage: Attach this script to Tilemap layer, assign tiles, hit play
+// tested with unity version: 2017.2.0b4
+// info: Fills tilemap with random tiles
+// usage: Attach this script to empty gameobject, assign some tiles, then press play
 
 using UnityEngine;
+using UnityEngine.Tilemaps;
 
-public class RandomTiles : MonoBehaviour
+namespace UnityLibary
 {
-    public Tile[] tiles;
-
-    void Start()
+    public class RandomTiles : MonoBehaviour
     {
-        RandomTileMap();
-    }
+        public int width = 32;
+        public int height = 32;
 
-    void RandomTileMap()
-    {
-        TileMap map = GetComponent<TileMap>();
+        public Tile[] tiles;
 
-        int sizeX = 32;
-        int sizeY = 16;
+        void Start()
+        {
+            RandomTileMap();
+        }
 
-        for (int x = 0; x < sizeX; x++)
+        void RandomTileMap()
         {
-            for (int y = 0; y < sizeY; y++)
+            // validation
+            if (tiles == null || tiles.Length < 1)
+            {
+                Debug.LogError("Tiles not assigned", gameObject);
+                return;
+            }
+
+            var parent = transform.parent;
+            if (parent == null)
+            {
+                var go = new GameObject("grid");
+                go.AddComponent<Grid>();
+                transform.SetParent(go.transform);
+            } else
+            {
+                if (parent.GetComponent<Grid>() == null)
+                {
+                    parent.gameObject.AddComponent<Grid>();
+                }
+            }
+
+            TilemapRenderer tr = GetComponent<TilemapRenderer>();
+            if (tr == null)
+            {
+                tr = gameObject.AddComponent<TilemapRenderer>();
+            }
+
+            Tilemap map = GetComponent<Tilemap>();
+            if (map == null)
             {
-                var tilePos = new Vector3Int(x, y, 0);
-                map.SetTile(tilePos, tiles[Random.Range(0, tiles.Length)]);
+                map = gameObject.AddComponent<Tilemap>();
+            }
+
+
+            // random map generation
+            Vector3Int tilePos = Vector3Int.zero;
+            for (int x = 0; x < width; x++)
+            {
+                for (int y = 0; y < height; y++)
+                {
+                    tilePos.x = x;
+                    tilePos.y = y;
+                    map.SetTile(tilePos, tiles[Random.Range(0, tiles.Length)]);
+                }
             }
         }
     }
-
 }