Final commit (v1.3)