Merged with v0.4.2