Security update (DLSA-2014-01)
Merge pull request #11 from olear/master

Security update (DLSA-2014-01)