Merged v0.1a