Finalizo issue #88