Updated README and SPEC for r21