Thanks for the reviews!
I haven't updated my pull request because I have some problems with failing tests.