Add kodak? to helpers
Merge remote-tracking branch 'upstream/master'