update to latest upstream/master
add custom url support