I removed that change for know, so no code changes anymore, should be easy to merge now!