Remove warnings (Fix #827)
Merge pull request #829 from gwtnb/remove-warnings

Remove warnings (Fix #827)