Update Github link
Merge branch 'develop'