Merge branch 'develop'
Changes done by Lainie
Merge pull request #17 from mozilla/some-changes

Some changes