Merged changes from alexborro in Marlin_v1