Fix types
Update version
Merge branch 'release/3.0.1' into develop