diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index 97fa3f60..ce59d139
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xebium</artifactId>
   <groupId>com.xebia.incubator</groupId>
-  <version>0.13-SNAPSHOT</version>
+  <version>0.15-SNAPSHOT-mqm</version>
   <name>Xebium</name>
   <packaging>jar</packaging>
 
@@ -29,20 +29,21 @@
   </licenses>
 
   <properties>
-    <selenium.version>2.42.0</selenium.version>
-    <fitnesse.version>20130530</fitnesse.version>
+    <selenium.version>2.45.0</selenium.version>
+    <fitnesse.version>20150424</fitnesse.version>
     <fitnesse.port>8000</fitnesse.port>
     <fitnesse.expiration>0</fitnesse.expiration>
+    <orgjson.version>20140107</orgjson.version>
     <maven-classpath-plugin.version>1.7</maven-classpath-plugin.version>
-    <slf4j.version>1.6.4</slf4j.version>
+    <slf4j.version>1.6.6</slf4j.version>
     <operadriver.version>1.1</operadriver.version>
-    <phantomjsdriver.version>1.0.3</phantomjsdriver.version>
+    <phantomjsdriver.version>1.2.1</phantomjsdriver.version>
     <commons-lang.version>2.6</commons-lang.version>
   </properties>
 
   <scm>
-    <connection>scm:git:git://github.com/xebia/Xebium.git</connection>
-    <developerConnection>scm:git:git@github.com:xebia/Xebium.git</developerConnection>
+    <connection>scm:git:git://github.com/sglebs/Xebium.git</connection>
+    <developerConnection>scm:git:git@github.com:sglebs/Xebium.git</developerConnection>
     <url>scm:git:http://github.com/xebia/Xebium</url>
   </scm>
 
@@ -78,7 +79,7 @@
       <version>${operadriver.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.github.detro.ghostdriver</groupId>
+      <groupId>com.codeborne</groupId>
       <artifactId>phantomjsdriver</artifactId>
       <version>${phantomjsdriver.version}</version>
     </dependency>
@@ -87,6 +88,11 @@
       <artifactId>commons-lang</artifactId>
       <version>${commons-lang.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>${orgjson.version}</version>
+    </dependency>
     <!-- for some reason FitNesse appears to conflict with guava 15 from selenium -->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -131,7 +137,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -274,7 +280,7 @@
     <profile>
       <id>fitnesse-integration</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <activeByDefault>false</activeByDefault>
       </activation>
       <build>
         <plugins>
@@ -325,7 +331,7 @@
     <name>Xebia B.V.</name>
     <url>http://xebia.com</url>
   </organization>
-  
+
   <developers>
     <developer>
       <id>sgrijpink</id>
diff --git a/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java b/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java
index 34b5db67..a69d4fc2 100644
--- a/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java
+++ b/src/main/java/com/xebia/incubator/xebium/DefaultWebDriverSupplier.java
@@ -126,6 +126,10 @@ public void setBrowser(String browser) {
 		this.browser = browser;
 	}
 
+    public String getBrowser() {
+        return this.browser;
+    }
+
 	public void setCustomProfilePreferencesFile(
 			File customProfilePreferencesFile) {
 		this.customProfilePreferencesFile = customProfilePreferencesFile;
diff --git a/src/main/java/com/xebia/incubator/xebium/RemoteWebDriverSupplier.java b/src/main/java/com/xebia/incubator/xebium/RemoteWebDriverSupplier.java
index f1e6ee9c..21ebacf3 100644
--- a/src/main/java/com/xebia/incubator/xebium/RemoteWebDriverSupplier.java
+++ b/src/main/java/com/xebia/incubator/xebium/RemoteWebDriverSupplier.java
@@ -99,7 +99,9 @@ public Capabilities getCapabilities() {
 	 * @throws RuntimeException in case of any error
 	 */
 	public WebDriver get() {
-		return new Augmenter().augment(new RemoteWebDriver(getRemote(), getCapabilities()));
+		RemoteWebDriver remoteWebDriver = new RemoteWebDriver(getRemote(), getCapabilities())   ;
+		remoteWebDriver.setFileDetector(new org.openqa.selenium.remote.LocalFileDetector()); // https://saucelabs.com/resources/selenium-file-upload
+		return new Augmenter().augment(remoteWebDriver);
 	}
 
 
diff --git a/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java b/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java
index 9fe6e0a5..ba31bbc2 100644
--- a/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java
+++ b/src/main/java/com/xebia/incubator/xebium/SeleniumDriverFixture.java
@@ -36,7 +36,7 @@
 
 import static com.xebia.incubator.xebium.FitNesseUtil.*;
 import static org.apache.commons.lang.StringUtils.join;
-
+import org.openqa.selenium.Keys;
 /**
  * Main fixture. Starts a browser session and execute commands.
  */
@@ -81,8 +81,16 @@ public class SeleniumDriverFixture {
 
 	public SeleniumDriverFixture() {
 		super();
+        initSpecialKeysMapping();
 	}
 
+    private void initSpecialKeysMapping() {
+        aliases.put("$KEY_BACKSPACE", Keys.chord(Keys.BACK_SPACE));
+        aliases.put("$KEY_TAB", Keys.chord(Keys.TAB));
+        aliases.put("$KEY_ENTER", Keys.chord(Keys.ENTER));
+        aliases.put("$KEY_RETURN", Keys.chord(Keys.RETURN));
+    }
+
     private WebDriver defaultWebDriverInstance() {
       return defaultWebDriverSupplier.newWebDriver();
     }
@@ -251,7 +259,10 @@ private void setTimeoutOnSelenium() {
 		executeCommand("setTimeout", new String[] { "" + this.timeout });
         WebDriver.Timeouts timeouts = getWebDriver().manage().timeouts();
         timeouts.setScriptTimeout(this.timeout, TimeUnit.MILLISECONDS);
-        timeouts.pageLoadTimeout(this.timeout, TimeUnit.MILLISECONDS);
+        if (defaultWebDriverSupplier.getBrowser() != null &&  // mqm fix for use with the hsac bridge
+				defaultWebDriverSupplier.getBrowser().toLowerCase().equals("safari"))  //mqm fix for #137 - safari does not support this API
+				return;
+		timeouts.pageLoadTimeout(this.timeout, TimeUnit.MILLISECONDS);
 	}
 
 	/**
diff --git a/src/main/java/com/xebia/incubator/xebium/fastseleniumemulation/Type.java b/src/main/java/com/xebia/incubator/xebium/fastseleniumemulation/Type.java
index 1d394daa..510fd954 100644
--- a/src/main/java/com/xebia/incubator/xebium/fastseleniumemulation/Type.java
+++ b/src/main/java/com/xebia/incubator/xebium/fastseleniumemulation/Type.java
@@ -23,6 +23,8 @@ protected Void handleSeleneseCommand(WebDriver driver, String locator, String va
 		if (value == null) {
 			value = "";
 		}
+        value = value.replace("\\08", Keys.BACK_SPACE); // sglebs fix
+        value = value.replace("\\09", Keys.TAB); // sglebs fix
 		value = value.replace("\\10", Keys.ENTER);
 		value = value.replace("\\13", Keys.RETURN);
 		value = value.replace("\\27", Keys.ESCAPE);