Merge pull request #666 from totten/pull-request-638