Here are the proposed changes based on Matthew's posted patches earlier:
(@Black Hole - you can fetch a patch from https://github.com/hummypkg/webif/pull/1.patch should you wish)
(@Black Hole - you can fetch a patch from https://github.com/hummypkg/webif/pull/1.patch should you wish)