Merge pull request #44 from MaskRay/const-const