Fix issue #338
Merge pull request #339 from nenioscio/master

Fix issue #338