Module aliases branch.
Merge pull request #2 from yallop/module-aliases

Module aliases branch.