Fixes #87 and Fixes #88
Prepare 3.7.0 release