Merge pull request #222 from holblin/master

Security patch