changes made to allow fragmented urls
Merge branch 'patch' into integration