Implemented optimistic locking
Merge pull request #5 from whiskeysierra/feature/optimistic-locking

Implemented optimistic locking