3.7.x

Major upgrades...

 - [ ] close #105 when merged