Some improvements and upgrade to Akka 2.1.2
Merge pull request #3 from patriknw/wip-improvements1

Some improvements and upgrade to Akka 2.1.2