removed hardcoded URLs, fixed #395