Updated from elementary git