Tests for #131
Merge pull request #142 from giastfader/master

Tests for #131