Merge pull request #2 from sudosurootdev/kk44

merge vanir upstream changes
Merge pull request #3 from sudosurootdev/kk44-sudosurootdev

Merge pull request #2 from sudosurootdev/kk44