Use url builder instead of hardcoded urls
Merge pull request #11 from diyan/master

Use url builder instead of hardcoded urls