Rossella/issue11

Fix #11