Fix for #162
Merge pull request #164 from mvala/master

Fix for #162