Merge pull request #623 from hcavarsan/issue-590