bug fixes
Merge branch 'akka' of https://github.com/juliusse/freeplane into akka