Fix for debian environments

Hi, 

Now you module works well with ubuntu, but i use on Debian and i make this changes for working also. And also added changes for other pull request. 
haha no problem , i check always new code diff with meld or other tools better that github viewer.