updated documentation with new changes on master