Merge pull request #911 from jm4R/basic_sublodules