merge from shunfa/crawlzilla