Final change for v0.2.1