Merge remote-tracking branch 'upstream/master'
fix blacklist bug & parameterize NULL to ?
Merge pull request #460 from cutedemons/master

fix blacklist bug & parameterize NULL to ?