User Manual and updates
merge