First push
Merge https://github.com/thekhana/thekhana
First Changes