Tried to follow teh link but I was unable to squash both commits into one. Will create  a new pull request, sorry for all the work :(