diff --git a/build.sbt b/build.sbt
index f2c4dd73..43a1d7d0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,8 +3,8 @@ name:="scala-gopher"
 
 organization:="com.github.rssh"
 
-scalaVersion := "2.12.1"
-crossScalaVersions := Seq("2.11.8", "2.12.1")
+scalaVersion := "2.11.8"
+//crossScalaVersions := Seq("2.11.8", "2.12.1")
 
 resolvers += Resolver.sonatypeRepo("snapshots")
 
@@ -33,6 +33,18 @@ libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.4.16"
 
 version:="0.99.9-SNAPSHOT"
 
+<<<<<<< HEAD
+// disable publish to sonatype from community build:
+//publishMavenStyle := true
+//
+//publishTo <<= version { (v: String) =>
+//  val nexus = "https://oss.sonatype.org/"
+//  if (v.trim.endsWith("SNAPSHOT")) 
+//    Some("snapshots" at nexus + "content/repositories/snapshots") 
+//  else
+//    Some("releases" at nexus + "service/local/staging/deploy/maven2")
+//}
+=======
 
 
 publishMavenStyle := true
@@ -44,6 +56,7 @@ publishTo := version { (v: String) =>
   else
     Some("releases" at nexus + "service/local/staging/deploy/maven2")
 } .value
+>>>>>>> master
 
 
 publishArtifact in Test := false
diff --git a/src/main/scala/gopher/Transputer.scala b/src/main/scala/gopher/Transputer.scala
index 20cc4d5e..f3ce75df 100644
--- a/src/main/scala/gopher/Transputer.scala
+++ b/src/main/scala/gopher/Transputer.scala
@@ -330,7 +330,9 @@ object Transputer
 
  class TooManyFailures(t: Transputer) extends RuntimeException(s"Too many failures for ${t}", t.recoveryStatistics.firstFailure.get)
  {
-   addSuppressed(t.recoveryStatistics.lastFailure.get) 
+  val lastFailure = t.recoveryStatistics.lastFailure.get
+  //wait for jdk 8
+  // addSuppressed(t.recoveryStatistics.lastFailure.get) 
  }
 
  object RecoveryPolicy {
diff --git a/src/main/scala/gopher/channels/ActorBackedChannel.scala b/src/main/scala/gopher/channels/ActorBackedChannel.scala
index 0ecfaa82..35c83458 100644
--- a/src/main/scala/gopher/channels/ActorBackedChannel.scala
+++ b/src/main/scala/gopher/channels/ActorBackedChannel.scala
@@ -47,7 +47,7 @@ class ActorBackedChannel[A](futureChannelRef: Future[ActorRef], override val api
                                                closedEmpty = true
                                          case _ =>  // do nothing
                                      }
-                                 }
+                                 }(api.executionContext)
      }
    } else {
      futureChannelRef.foreach( _ ! cont )
diff --git a/src/test/scala/gopher/channels/IOTimeoutsSuite.scala b/src/test/scala/gopher/channels/IOTimeoutsSuite.scala
index 6bf0a7dc..159ca431 100644
--- a/src/test/scala/gopher/channels/IOTimeoutsSuite.scala
+++ b/src/test/scala/gopher/channels/IOTimeoutsSuite.scala
@@ -62,7 +62,7 @@ class IOTimeoutsSuite extends FunSuite with Waiters {
       f2 onComplete { x => w(assert(x.isFailure && x.failed.get.isInstanceOf[ChannelClosedException]))
                            w.dismiss()
       } 
-      Await.ready(f2, 1 second)
+      Await.ready(f2, 3 seconds)
       val f3 = chTimeout.aread
       f3 onComplete { x => w(assert(x.isFailure && x.failed.get.isInstanceOf[ChannelClosedException]))
                            w.dismiss()
@@ -99,7 +99,7 @@ class IOTimeoutsSuite extends FunSuite with Waiters {
                 case t: chTimeout.read =>
                             implicitly[FlowTermination[Unit]].doExit(count)
               }
-      Await.ready(f, 1 second)
+      Await.ready(f, 3 second)
       assert(count==2)
   }