Merge pull request #29 from colincross/doc

Add self-documenting support