Issue #537
Merge pull request #538 from nicoschtein/issue-537

Issue #537