Merge from Main #84

Merged
MrLyallCSIT merged 2 commits from main into bug/70 2020-08-13 19:39:18 +00:00