Doc inspired fixes
Merge pull request #22 from umpirsky/fix/doc-inspired-improvements

Doc inspired fixes