Further updates (v0.1.4.a1)