Merge pull request #2 from sudosurootdev/kk44

merge vanir upstream changes