Merge pull request #873 from Cyan4973/dev

v0.8.2