Merge pull request #358 from eandersson/master

Fix for Issue #357.