Merge pull request #1215 from ErikZalm/Marlin-v1-bug-fixing

Merge pull request #1214 from ErikZalm/Marlin_v1