Improved the friendly URL function
Merge remote-tracking branch 'origin/master'