Updated version #
Merge branch 'develop'