Third step
Merge branch 'step-3' of https://github.com/leoht/cream-php into step-3