Merge pull request #2 from cafetemplates/dev

Dev
Merge branch 'master' of https://github.com/cafetemplates/kraken into dev