Prepared v0.6.8 fixes #38