fix issue  #346
Merge remote-tracking branch 'origin/master'