Merge tag '0.4.0' into dev

Add options
fix: Increment concats counter
Version bump
Merge branch 'release/0.4.1'