add updates recently
Merge branch 'develop'