Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
* fixed file..disabled