Merge updates for #1 into gh-pages