Changed to work with Akka 2.3.7 and Scala 2.11