Fixes #314
Merge pull request #315 from andreabalducci/master

Fixes #314