Merge pull request #12 from Telefonica/task/versionable