Added choice, minor improvs
Minor improvs
Added choice and anyContent
initial
0.3.0.0