no more ajax call (I hate ie)
Merge branch 'master' into gh-pages