Merge pull request #1410 from SpecLad:module-samples