Issue 337
Merge pull request #349 from AndreiH/issue_337

Issue 337