Updated custom modules
Merge pull request #142 from haydenbleasel/development

Updated custom modules