Add merge request from original TOTO: Added url suffix option #102