Refactor
Merge pull request #2 from strika/refactor

Refactor scraper