diff --git a/build.gradle b/build.gradle
index d8aa34e4..dfd4413d 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
 apply plugin: 'maven' // for uploading to a maven repo
 apply plugin: 'checkstyle'
 
-version = "7.1.7"
+version = "7.1.8"
 group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 
diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
index 72f1f394..07805e68 100644
--- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang
+++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
@@ -570,3 +570,11 @@ command.buildcraft.buildcraft.version.format=Format: /%s
 command.buildcraft.buildcraft.changelog.desc=- %s : Changelog
 command.buildcraft.buildcraft.changelog.help=Displays the latest BC changelog.
 command.buildcraft.buildcraft.changelog.format=Format: /%s
+
+command.buildcraft.buildcraft.op.desc=- %s : Op FakePlayer
+command.buildcraft.buildcraft.op.help=Gives OP rights to the BC FakePlayer (acts in the name of quarries, robots, etc.)
+command.buildcraft.buildcraft.op.format=Format: /%s
+
+command.buildcraft.buildcraft.deop.desc=- %s : Deop FakePlayer
+command.buildcraft.buildcraft.deop.help=Gives OP rights to the BC FakePlayer (acts in the name of quarries, robots, etc.)
+command.buildcraft.buildcraft.deop.format=Format: /%s
\ No newline at end of file
diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png
index 173a20c3..2967debc 100755
Binary files a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png and b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png differ
diff --git a/buildcraft_resources/changelog/7.1.8 b/buildcraft_resources/changelog/7.1.8
index 99bf25e4..7e25e13d 100644
--- a/buildcraft_resources/changelog/7.1.8
+++ b/buildcraft_resources/changelog/7.1.8
@@ -1,5 +1,6 @@
 Improvements:
 
+* Improvements to /buildcraft command (asie)
 * New robot board texture (asie)
 
 Bugs fixed:
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index f8274653..f6bec104 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:7.1.7
+1.7.10:BuildCraft:7.1.8
diff --git a/common/buildcraft/core/lib/commands/CommandHelpers.java b/common/buildcraft/core/lib/commands/CommandHelpers.java
index 908a50b6..e3bbf253 100644
--- a/common/buildcraft/core/lib/commands/CommandHelpers.java
+++ b/common/buildcraft/core/lib/commands/CommandHelpers.java
@@ -111,6 +111,14 @@ public final class CommandHelpers {
 	public static boolean processStandardCommands(ICommandSender sender, IModCommand command, String[] args) {
 		if (args.length >= 1) {
 			if ("help".equals(args[0])) {
+				if (args.length >= 2) {
+					for (SubCommand child : command.getChildren()) {
+						if (matches(args[1], child)) {
+							child.printHelp(sender);
+							return true;
+						}
+					}
+				}
 				command.printHelp(sender);
 				return true;
 			}
diff --git a/common/buildcraft/core/lib/commands/SubCommand.java b/common/buildcraft/core/lib/commands/SubCommand.java
index edf3a44b..c5e567e4 100644
--- a/common/buildcraft/core/lib/commands/SubCommand.java
+++ b/common/buildcraft/core/lib/commands/SubCommand.java
@@ -20,7 +20,7 @@ import net.minecraft.command.ICommandSender;
 public abstract class SubCommand implements IModCommand {
 	public enum PermLevel {
 		EVERYONE(0), ADMIN(2), SERVER_ADMIN(3);
-		int permLevel;
+		final int permLevel;
 
 		PermLevel(int permLevel) {
 			this.permLevel = permLevel;