Updated v0.4.2 from master