Fix Firefox's issue related to #106
Merge branch 'master' into manage-space-for-FF
Merge pull request #108 from Ephemera/manage-space-for-FF

Fix Firefox's issue related to #106