Backport changes from `0.4` version
Merge remote-tracking branch 'hwi/0.3' into 0.3