Update description on website
Merge remote-tracking branch 'upstream/master'