Fix compiler warnings I added.
Merge pull request #124 from greboid/master

Fix compiler warnings I added.