Ok, done. Please see the new commit.