Merge pull request #866 from tSed/master