Merge pull request #80 from shabanovd/develop

result of checks on deadlock situations