Merging PR #1 from Mike in refactor branch iweb