merge for 0.2.18 release