Added the ability to have samples inside a module.
Merge pull request #1410 from SpecLad:module-samples