Merge branch 'feature/improve-version' into 'develop'