Fix scraping problem (empty template)
Merge remote-tracking branch 'origin/master'