Improve URL builder
Release 1.2.4