Merge pull request #592 from danvk/issue-524