Merge pull request #18 from L1ghtn1ng/kali

more fixes for kali
Merge remote-tracking branch 'upstream/master' into kali
merge upstream