Resolves #301
Merge branch 'issue-301' into urda-local-http-fix