Fix bug #399
Merge pull request #57 from gabriele-v/master

Fix bug #398