Fix issue #349
Merge pull request #352 from simon816/patch-1

Fix issue #349