Fixed #468
Fixed #464
Fixed #466
Release commit
Fixed #470
Release commit