Merge pull request #263 from svost/const