Fix for #193
Merge pull request #194 from mvala/master

Fix for #193