Sergei, I made it as we agreed, please see the new commit: