Updating documentation under #17