Fixing performance bottleneck
Merge branch 'fix/bottleneck'
Release v0.3.3