changed some descriptions
Merge: master into gh-pages