develop add desc
merge master to dev