Merge changes into master

Merges custom de Souza changes to YOURLS into the master