fix blank error
Merge remote-tracking branch 'dicos/master'