remove detailed todo comment
add localhost to whitelist
Merge remote-tracking branch: upstream/master