Minor editions to extensibility.
Merge pull request #525 from hruellan/extensibility

Minor editions to extensibility.