merge nick’s change
update to 3.0.3