sounds working, but not totally in FF on ubuntu
Merge branch 'master' into gh-pages