Updated to work with Scala 2.11 and akka 2.3