added blacklist
Merge branch 'hotfix/20141119-blocks1'