Solve bug #210.
Merge pull request #258 from giorgio130/master

Solve bug #210.