Updated Marlin_v1 branch from ErikZalm