Fixing #192
Merge pull request #69 from mozilla/fixing-192

Fixing #192