my commit
Merge branch 'long_chef'