Fix bug #144.
Merge pull request #150 from giorgio130/master

Fix bug #144