updated to work with akka 2.1.2