Combine thezoggy's 1080p branch with Pistachitos