Merge pull request #485 from dwmw2/master