Removed duplicate url parsing, fixes #8