Import/Export #47 and fix url regex