Merge pull request #118 from gabriele-v/master

Fixes