add Choice and ChoiceWithEmpty
release v0.6.0