Merge pull request #823 from DavidKarlas/master