Fix dependincies
Merge branch 'master' into cooking