Fixes Issue 5.2, https://bug837994.bugzilla.mozilla.org/attachment.cgi?id=747138

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Fixes Issue 4.1, https://bug837994.bugzilla.mozilla.org/attachment.cgi?id=747134

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>