Version 0.8.6, Fixes #88