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

Sync with modulesync