Final commit (v1.4)