Updated documentation as per latest spec.
Merged latest version