Issue #339
Merge pull request #354 from cristianoc72/issue-339

Issue #339