Khanify things again
Merge pull request #1 from killpack/master

Khanify things again