Update staging from gh-pages

This should update the `staging` branch and resolve #144, #145, #146, and #147.