Merge branch 'JonasAlfredsson-add_mod'