Original commit of my solution