merge changes from URLify 064241f45d198239b589c657ea22966f95c80d96