merged from 1.0.0 release