fixed #24
Merge branch 'master' of github.com:Sixdsn/MOZ_OVERRIDE