Rossella/issue18

Fix issue #18