timfel Merge pull request #871 from topazproject/alex-patch-1 …