Fixes #485
Merge pull request #486 from ranum/master

Fixes #485