Initial commit
Merge https://github.com/hyshka/moksha