fix #379
make all
Merge branch 'master' into gh-pages