Fix issue #320
Merge pull request #321 from pronebird/master

Fix issue #320