Modules

Merged Chris Hines requested to merge modules into master

Merge request reports