merge elmarkout fork