Merging Changes from ENRS to fork
Merge pull request #1 from pstenbjorn/updates-to-spec

Merging Changes from ENRS to fork