fix some bugs, probobally introduce some more.
Merge branch 'master' of https://github.com/joelina/Go-scrape