0.8.2

Merge