Fix issue #30
Merge pull request #31 from ggiamarchi/issue#30

Issue#30