Merge remote-tracking branch 'rafal-krypa/issue84' into v1.0.x