Master

This PR includes just some minor cleanups that should not have any impact on the functionality
The default is no escaping, `true` sets default escaping and you can also provide your own escaping function as the third argument. Makes sense?