Merge pull request #1 from shadym/master

Making of unit of work