manually merged aspects of 0.3.5 that were inconsistent with 0.3.7