Fix for #141
Merge pull request #142 from gvas/fix-for-141

Fix for #141