rewrote urls

resolve #10
Merge pull request #13 from aaronmallen/feature/rework_url

10-rework_url