Some way towards working in FxOS
Merge pull request #131 from devgeeks/some-fxos-changes

Some way towards working in FxOS