Applying changes made in v0.1.2