Fixes based on review w/ stephen
Bug fix
Merge pull request #27 from Excelsior-Systems/James_mar20

James mar20