LW security patch
Merge pull request #13 from f0o/master

LW security patch