Updated v0.5.0 from master