update with last commits from ErikZalm Marlin