Updated to work with Firefox positional tracking.
Merge branch 'master' into gh-pages