During the last two days I implemented a few improvments:
Unittests would still be nice to have, but I think it's better to integrate this now and improve later then to wait any longer.