adjusted the code to scala 2.10 and akka 2.1