merged v0.1