Fixed compiler warnings
Merge pull request #744 from bvssvni/newdesign

Fixed compiler warnings