Use additive merge logic. Fix #12
Bump version to 0.4.0