missing stuff
Merge branch 'master' of github.com:fakeyou/kratos