Merge pull request #6 from jakegavin/Module2b

Module2b