Merge pull request #30 from jbaruch/master

better module names