Fix for #299, including test.
Merge pull request #338 from lowerends/develop

Fix for #299, including test.