Updated to the last commit of ErikZalm Marlin version. Ready to pull request