Fixed problem with url parameters introduced when merging PR #6