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

Issues 348 & 350
Merge branch 'master' into Issue374