support dasherized modules
Merge branch 'develop'