bug

regresh
Merge branch 'dev1' into gh-pages