Combine one commit
Merge branch 'master' of github.com:mayoz/framework