modified scrapy
Merge branch 'develop'