Merge pull request #128 from bvssvni/master

Fixed dead code warnings