Fix for #24 (Handle ComplexType properties)

This fix is limited to one level of ComplexType types.