Merge branch 'develop'
update contributor
Merge branch 'master' into develop