Merge pull request #845 from jmeas/master

Extended `module` functionality