Late changes
Merge branch 'master' of https://github.com/pecea/cake/