fixes #104
Merge pull request #118 from mozvip/development

fixes #104