Updated to v0.2b