Lintian fixes
Merge pull request #202 from arioch/master

Style / lintian fixes