extension of version field
Merge branch 'dev'