Made support for auto return url. Just leave return url null