First commit
Fixed checking for http(s)
cleanup