:wastebasket: Added some fixes #88

Closed diazmartin closed 4 years ago