Merge pull request #181 from setrofim/master

Module initialization optimizations.