Merge pull request #653 from neheb/d