More fun with modules
Merge pull request #35 from Tradeshift/master

More fun with modules