Fix doc comments. Expand on package doc comment.
Merge branch 'hotfix-0.4.1'