fixed discriptions
Merge branch 'master' into webserver