Fix for issue #1360
Merge pull request #1359 from adeleusiere/develop

Improved URL safe formatting method
This is super cool, Thanks!
Fix of for issue #1345