dev trial update
Merge branches 'dev' and 'gh-pages' into gh-pages