Merge pull request #26 from teodoryantcheff/refactor

base_url removed