Merge pull request #1 from ErikZalm/Marlin_v1

Update