added replacement for modules into includes option [closes #4]
Merge branch 'include-module-replacement' into develop