Updated v0.4.1 from master