fix issue #329
Merge pull request #331 from cxa/master

Fix issue #329