Updated to v.0.4.8