Mohammed El banyaoui

Thank you

Hi [willmendesneto](https://github.com/willmendesneto) thanks for your time, I've added all the changes you requested and they're helpful

@willmendesneto can you re-check, thanks