modified module extension
Merge branch 'raysmond'