merge for release of 0.10.0