fixing some warnings
Merge pull request #183 from HRZaheri/master

fixing some warnings