Added cinnamon stuff, changed license