Committing to be able to pull.
Merge branch 'master' of https://github.com/kaisarea/loki