Made changes for v0.2.0b