Some changes for a 0.3.7 release