fix some warnings
Merge remote-tracking branch 'origin'

merging denielz's command line change