URL support closes #5