Updated documentation, ticket #86