Fixes #3
Merge branch 'fix/i3' into dev