Reuse const version for non-const one
Merge pull request #212 from Dmitry-Me/reuseConstForNonConst

Reuse const version for non-const one