Merge pull request #991 from Cyan4973/dev

v0.8.3