supports module development
Merge branch 'raysmond'