Updated v0.4.3 from master