Updated to v0.1.8