fix version and description optionals
Merge branch 'develop'