Fix #60 Fix #50
Merge pull request #70 from mmarsman1/development

Fix #60 Fix #50