Issues #44 y #45