Adds an interface for creating conventions
Tweak version number
Merge branch 'develop'