fix crawler
Merge branch 'master' of github.com:mcatm/rippingyard
Merge branch 'master' of github.com:mcatm/rippingyard
Merge branch 'master' of github.com:mcatm/rippingyard
Merge branch 'master' of github.com:mcatm/rippingyard
Merge branch 'master' of github.com:mcatm/rippingyard
Merge branch 'master' of github.com:mcatm/rippingyard
fix conflict