v2.0.0-beta1, resolve #154 #245