added option to specify URL too
added new checks