makros (updated)
thesis (updated)