QA/QC Edits
Merge pull request #200 from mvonbargen/patch-76

QA/QC Edits