merge fix

PR fixes
Merge pull request #392 from Pomax/betterurls

delicious digests