Slight structure changes. Edited comments for report.
Merge pull request #1 from ameske/master

MERGE