doc modified & added
Merge branch 'work'