Closes #87.
Closes #79.
Merge branch 'master' into v0.10