Rollup PR against develop

This contains PRs #25, #26, #27, and #28, rebased against develop.