Merge 0.3.2 official

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>