Final 1.0.4.2 Commit

finalised 1042 commit