Resolviendo part del issue #21
Resolviendo part del issue #20