cherry pick files from #29
Merge branch 'merge-29' into gh-pages (cherry picked files) (close #29)