Added :description field to asd file
Merge remote branch 'upstream/master'