Demo prepation
Merge branch 'master' of https://github.com/yunusb/loki.git