Initial commit from v0.4.4