Updated to v0.0.16