no change
complete merge
add url handling
changed self init tagged
fixed url conflicts