Fixed url requests and relocated then in code
Merge pull request #23 from TFaga/master

Fixed url requests