Added https support, improved timings