Final 1.0.4.2 Commit

Finalised Commit for 1.0.4.2