Fix URL paths bug
Fix merge conflict
Fix merge conflicts
Merge pull request #11 from florinpapa/7-fixPath

Fix URL paths bug