Merge pull request #7 from alsorokin/CB-12763