Updated to v.0.1.7