Merge branch 'developer'
Update version