Merge pull request #95 from kainjow/master

Fix warnings about dropping const qualifier