v1.0.4
Release v1.0.5
Merge branch '1.0'