Small changes from abandoned light matter reader branch.
Merge pull request #279 from terrycojones/small-changes-for-light-matter-integration-276-2

Small changes from abandoned light matter reader branch.

Fixes #276