Merge pull request #864 from neheb/2