TomK82/Ticket 9355

and I'm busy with my other project anyways.
0.2 of exabuch is coming up and needs some more tests