Code

Merge branch 'jk/add-i-mode'