Merge pull request #272 from mikedewar/master

redesign