Merge pull request #6 from sjfahr/master

Unified optics runs are debugged