fixup! Added algorithms choice to the RFC
Fixed DATA message implementation to support the RFC changes
Fixed samples