Done and sent in a different pull request. I think I shall work from a new branch fore every issue and not disturb the develop branch. That way I have a safety net.