Arakoon 359 2

Still waiting for a final run on CI, but everything should be ok now.