Fixes urls
Merge pull request #275 from twokul/fix-for-url

Fixes urls
More fixes
Merge pull request #276 from twokul/moar-fixes

More fixes