Tested in Debian 7
Merge pull request #162 from lub/patch-1

Tested in Debian 7