Updated
Updated
Feedback from @ericf
Updated.
Merge remote-tracking branch origin/master into fix-modules
Updated
Merge pull request #4 from imalberto/fix-modules

Batch of fixes