Devel

Merged Aaron Dees requested to merge devel into master

Merge to master for first release

Merge request reports