[fix] Make sure companyId is replaced before URL is added
Merge pull request #21 from alex-deaconu/master

[fix] Make sure companyId is replaced before URL is added