Merge pull request #674 from danvk/module