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

fixing some warnings
Merge branch 'espresso'