Now everything works in Ubuntu and Mac