Updating documentation
Merged my code changes with Daniel's code changes.