Merge pull request #150 from gabriele-v/master

Fix bug #450