Merge pull request #866 from neheb/2