Finishing the Issue #7. Credits to dev-ggallon