IME fix. Fixes #478
Small fixes
Release v4.0.2