Closes #114.
Merge branch 'v0.10'