Improve scraping fix #29, fix #34