Updated version
Updated version
Merge pull request #371 from balint42/master

Debian changes to master
Merge branch 'master' into debian