const correctness fixes
Merge pull request #337 from bucienator/master

fixed const correctness