Fixed compiler warnings
Merge pull request #681 from bvssvni/master

Fixed compiler warnings