Merge pull request #439 from zeroadam/Issue3873