Merged in feature/random-bug-fixes (pull request #27)
develop
2019-07-30, Gary Kramlich