Merge pull request #69 from mdeters/bug594