fix bug in BLACK_LIST definition
Merge branch 'master' into dev