Issue #97 - testContext now would return a corrected number if applicable.
Merge pull request #98 from maksimov/develop

Issue #97 - testContext now would return a corrected number if applicabl...