Updated to v.0.6.1