Merge branch 'gh-pages'
bug fix for file var
Merge branch 'master' into gh-pages