Merge pull request #123 from fsb4000/doc