Fixes #96 e Fixes #95