Change URL Shortener
Last change for URL Shortener. Fix #3