Improved const-correctness.
Merge pull request #63 from zuck/const-correctness

Improved const-correctness.