Small Updates
Merge pull request #1373 from clark-stevenson/dev

Small Updates