Merge #135 and #136 into develop

This simply syncs the `develop` branch with the two pull requests I sent you earlier (#135 and #136).