Merge pull request #17 from efullea/develop

Addressing Mozilla's comments