Merge pull request #2 from gaillard/master

Use version method of optimistic concurrency instead of the whole docume...