Merge pull request #1199 from goabout/merge_modules

Merge modules