diff --git a/api/gravestone b/api/gravestone
index 3617ac54..d0c1b8d0 160000
--- a/api/gravestone
+++ b/api/gravestone
@@ -1 +1 @@
-Subproject commit 3617ac545fa72914d757f8079d52f13e279f62f4
+Subproject commit d0c1b8d0a624e6ae663bc42833a2890d7398cdf3
diff --git a/build.gradle b/build.gradle
index 9aa6c021..1cb84dba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ tasks.withType(JavaCompile) {
     targetCompatibility = "1.8"
 }
 
-version = "1.0.10"
+version = "1.0.10.1"
 group = "nightkosh.gravestone"
 archivesBaseName = "GraveStone-1.11.2-Graves"
 
diff --git a/src/main/java/nightkosh/gravestone/helper/GraveGenerationHelper.java b/src/main/java/nightkosh/gravestone/helper/GraveGenerationHelper.java
index 551a3a4a..82f97714 100644
--- a/src/main/java/nightkosh/gravestone/helper/GraveGenerationHelper.java
+++ b/src/main/java/nightkosh/gravestone/helper/GraveGenerationHelper.java
@@ -1,5 +1,6 @@
 package nightkosh.gravestone.helper;
 
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
@@ -725,16 +726,23 @@ private static BlockPos findPlaceForGrave(World world, BlockPos pos) {
     }
 
     private static int getGround(World world, int x, int y, int z) {
-        while ((world.isAirBlock(new BlockPos(x, y - 1, z)) || world.getBlockState(new BlockPos(x, y - 1, z)).getBlock().getMaterial(null).isLiquid() ||
-                world.getBlockState(new BlockPos(x, y - 1, z)).getBlock().getMaterial(null).isReplaceable()) && y > 1) {
-            y--;
+        while (true) {
+            BlockPos pos = new BlockPos(x, y - 1, z);
+            IBlockState state = world.getBlockState(pos);
+            if ((world.isAirBlock(pos) || state.getBlock().getMaterial(state).isLiquid() ||
+                    state.getBlock().getMaterial(state).isReplaceable()) && y > 1) {
+                y--;
+            } else {
+                return y;
+            }
         }
-        return y;
     }
 
     private static boolean canGenerateGraveAtCoordinates(World world, BlockPos pos) {
-        return world.getBlockState(pos.down()).getBlock().getMaterial(null).isSolid() &&
-                (world.isAirBlock(pos) || world.getBlockState(pos).getBlock().getMaterial(null).isLiquid() || world.getBlockState(pos).getBlock().getMaterial(null).isReplaceable());
+        IBlockState state = world.getBlockState(pos);
+        IBlockState stateDown = world.getBlockState(pos.down());
+        return stateDown.getBlock().getMaterial(stateDown).isSolid() &&
+                (world.isAirBlock(pos) || state.getBlock().getMaterial(state).isLiquid() || state.getBlock().getMaterial(state).isReplaceable());
     }
 
     protected static EnumGraves getGraveType(EnumGraveType[] graveTypes, EnumGraveMaterial... materials) {
diff --git a/src/main/resources/assets/gravestone/lang/es_mx.lang b/src/main/resources/assets/gravestone/lang/es_mx.lang
new file mode 100644
index 00000000..e07fde84
--- /dev/null
+++ b/src/main/resources/assets/gravestone/lang/es_mx.lang
@@ -0,0 +1,67 @@
+# Translate by: Dorzar / VeryHardChamp
+# Última actualización: 23/07/2017
+
+# Tabs
+itemGroup.tabGSGraveStone=Lápida
+
+# Blocks
+## Graves
+
+block.gravestone.gravestone.name=Lápida
+block.gravestone.cross.name=Cruz
+block.gravestone.obelisk.name=Obelisco
+block.gravestone.celtic_cross.name=Cruz celta
+block.gravestone.plate.name=Placa
+block.gravestone.dog_statue.name=Estatua de perro
+block.gravestone.cat_statue.name=Estatua de gato
+block.gravestone.horse_statue.name=Estatua de caballo
+block.gravestone.sword.name=Espada de un caballero caido
+block.gravestone.villager_statue.name=Estatua de aldeano
+block.gravestone.creeper_statue.name=Estatua de creeper
+block.gravestone.starved_corpse.name=Cadáver muerto de hambre
+block.gravestone.withered_corpse.name=Cadáver marchitado
+
+## Graves
+item.grave.age=Vivió
+item.grave.days=días
+item.grave.sword_name=Nombre
+item.grave.sword_damage=Daño
+
+
+# Death Messages
+death.GS.Herobrine=%1$s fue brutalmente asesinado por Herobrine.
+death.GS.death_sentence=%1$s recibió una sentencia de muerte.
+death.GS.tortures=%1$s murió a causa de terribles torturas.
+death.GS.mom=Your mom
+
+# Console messages
+grave.cant_be_looted=¡No puedes robar esta tumba!
+
+## Console commands ## TODO!!!!
+commands.not_enough_parameters=Not enough parameters!
+commands.coordinate_error=Coordinate error!
+commands.fill_grave.empty=There aren't any blocks at this coordinates!
+commands.fill_grave.wrong_block=This coordinates occupied by wrong blocks!
+
+
+# Materials ## TODO!!!!
+material.title=Hecho de
+material.mossy=Musgo
+material.wood=Madera
+material.sandstone=Arenisca
+material.red_sandstone=Arenisca roja
+material.stone=Piedra
+material.diorite=Diorita
+material.andesite=Andesita
+material.granite=Granito
+material.iron=Hierro
+material.gold=Oro
+material.diamond=Diamante
+material.emerald=Esmeralda
+material.lapis=Lapislázuli
+material.redstone=Redstone
+material.obsidian=Obsidiana
+material.quartz=Cuarzo
+material.prizmarine=Prismarina
+material.ice=Hielo
+