Made changes for v0.2.1b