Merge develop for v0.1.1 release

Want to try managing this via pull request.