Fix #851 by adding an URL Decode option