Fix bugs in blocklist handling
Merge pull request #56 from yang/patch-1

Fix bugs in blocklist handling