Updated docs with latest changes in master