glenfe Merge pull request #488 from Flamefire/nowide