fix #128, #129, #130
Merge pull request #131 from SenecaCDOT-BigBlueButton/fix-#129-#130

fix #128, #129, #130