Sync with modulesync
Merge pull request #141 from cmurphy/master

Sync with modulesync