Fixes #351
Fixes #348
Merge pull request #382 from FREEDM-DGI/Issues348-350

Issues 348 & 350