The task is ready github branch. I am waiting for your feedback to make a pull request. Is the implementation what did you expect?