Adding more documentation
Merging into my dev branch